move to right scope
Merge branch 'master' of github.com:XANi/config

Conflicts:
	manifests/site.pp