Bump Boxen Gem dependencies
Version bump to Puppetfile modules
Merge branch 'master' of https://github.com/boxen/our-boxen

Conflicts:
	Puppetfile.lock
Updated firefox and postgresql