fixing git shit
Merge branch 'master' of https://github.com/xebia-puppet/xebia-deployit

Conflicts:
	config/source_files.yaml