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

Conflicts:
	manifests/site.pp
	modules/projects/manifests/voodoo.pp