Clean up the readme.
Merge branch 'consistent-readme' into 'master'

Consistent readme