Merge pull request #1 from irjudson/master

Cleaning up build and readme.
Update README.md
Update README.md
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md