fixed up a mismerge
Merge pull request #30 from drewfish/cleanup

fixed up a mismerge
Merge branch 'master' into fast-prod

Conflicts:
	README.md