add puppet cache to gitignore and commit Puppetfile.lock to prevent dirty tree message
Merge branch 'master' of https://github.com/eadmundo/my-boxen