Merge pull request #1 from tpkelly/master

Update README instructions
Update README.md
Merge branch 'upstream'

Conflicts:
	README.md