Merge remote-tracking branch 'boxen/master'

Conflicts:
	Puppetfile
	Puppetfile.lock
	manifests/site.pp