fix
Merge branch 'master' of github.com:XANi/config

Conflicts:
	modules/emacs/manifests/init.pp