wip -- tricky merge

builds but has some issues running

some merge conflicts, about to get to

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

Update copyright to 2016