updated to latest dependencies
update ruby stuff
Merge pull request #633 from boxen/update-deps

Update Puppet and Ruby dependencies
Merge branch 'master' of https://github.com/boxen/our-boxen

Conflicts:
	Puppetfile.lock