tidying up (hopefully)
Merge branch 'master' of https://github.com/fvoges/our-boxen

Conflicts:
	Puppetfile
	modules/people/manifests/fvoges/applications.pp