changing minor bits to get things working
Merge branch 'master' of github.com:openstack-hyper-v/config

Conflicts:
	modules/openstack_project/manifests/users.pp