More updates
Merge branch 'master' of github.com:lee-dohm/install-discourse

Conflicts:
	README.md
More merging