updated readme
Merge pull request #1714 from cjgronlund/master-edits

updated readme