updating repo to match production
Refactoring
Merge branch 'master' of https://github.com/openstack-hyper-v-python/puppet-quartermaster

Conflicts:
	manifests/pxe.pp