first commit
Merge https://github.com/paulrapa/puppet