initial commit
Merge https://github.com/nicovanniekerk/puppet_testing