Added Puppetfile for r10k deployment
Merge branch 'production' into development
Merge branch 'development'