update librarian-puppet
update Puppet dependencies
Merge pull request #639 from boxen/update-librarian-puppet-and-puppet-git

Update librarian puppet and puppet git
Merge branch 'master' of https://github.com/boxen/our-boxen

Conflicts:
	Puppetfile
	Puppetfile.lock