moved to ssh://git@github.com/XANi/puppet-modules.git
Merge branch 'master' of github.com:XANi/config

Conflicts:
	modules/dpp/templates/dpp.conf.erb