Merge branch 'master' of https://github.com/boxen/our-boxen

Conflicts:
	Puppetfile
	Puppetfile.lock
Merge branch 'master' of github.com:pheekra/our-boxen

Conflicts:
	Puppetfile
	Puppetfile.lock
Update.