Test refactor
Merge branch 'master' of github.com:clempat/my-boxen

Conflicts:
	manifests/site.pp
	modules/people/manifests/clempat.pp
	modules/people/manifests/clempat/applications.pp
	modules/projects/manifests/quandoo.pp
	modules/projects/manifests/quandoo/yii.pp