Merge pull request #461 from khawkins/unstable

Syncing up package repo changes
2.0 to 2.1 upgrade instructions