Merge branch 'readme-edits'

Conflicts:
README.md