In the beginning there was a puppetmaster
Merge branch 'master' of github.com:jaxxstorm/Puppet