Quick editing pass on the README.md.
Merge branch 'master' into dev