Changes to Puppetfile.lock and new cache files from a boxen run
Merge remote-tracking branch 'origin/master'