Reorganized script
Merge branch 'master' of github.com:nigelb/cloud-init-helpers

Conflicts:
	script/centos/puppet-master-initializer.sh