Version upgrades and cleanups

This is still a work-in-progress; BC breaks need to be put into an UPGRADE-1.2 file

Addresses issues #53 and #57 
do not hard-code this