Stop overwriting config on install
Merge branch 'master' of github.com:tomas-edwardsson/puppet-push

Conflicts:
	Makefile