Tweak folder structure
Merge branch 'master' of github.com:odsod/dotfiles

Conflicts:
	puppet/manifests/site.pp