Merge branch 'master' of github.com:cargomedia/osx-setup into local-dns

Conflicts:
	README.md