wip -- tricky merge

builds but has some issues running

some merge conflicts, about to get to

Address minor comment from #1028

and add float() and str() param names
In addition noticed that we did not run one of our small numpy tests

Lots of merge issues, so tried to beef up the is_subclassable test as well.

Update copyright to 2016