Added Puppetfile for r10k deployments
Merge branch 'production'
Merge branch 'development'