initial commit
Merge https://github.com/wizbanicus/puppet