2.0 to 2.1 upgrade instructions
Merge pull request #462 from khawkins/unstable

2.0 to 2.1 upgrade instructions