README.md
Update README.md
Merge branch 'master' into production
fixed up readme for production

Conflicts:
	README.md