Update README
Merge branch 'master' into update_readme

Conflicts:
	README.md
Merge pull request #3 from kahnjw/update_readme

Update readme