First commit
Merge https://github.com/Fonzie2k/puppetmaster