Deploy user
Merge branch 'master' of github.com:whamilton42/puppet
Move site.pp into manifests folder