Update README.md

Need to merge master and readme-edits