Fixed dependcies in puppet manifest
Merge branch 'master' of https://github.com/tspycher/puppet-manifests

Conflicts:
	puppetinstall/puppet.manifest