2.0 Branch Fixes

The readme fixes here will apply to the 2.1 branch too.