Include latest version of foreman
Merge branch 'mavericks3' of https://github.com/plyfe/our-boxen into mavericks3

Conflicts:
	Puppetfile
	Puppetfile.lock