Conflicts:
	Puppetfile
	manifests/site.pp
Downgraded a couple of things in order to get boxen to work