More README fixes and content.
Merge branch 'master' into stripped-down