distro for centos is rhel
distro for centos is rhel
Merge branch 'master' of github.com:markllama/origin-setup

Conflicts:
	bin/create_allinone.sh