some README.md edits
Merge branch 'master' into server