Rollup of changes to v2.0

Bugfixes.  Starting versioning at 2.0.