use a separate puppet manifest git repo
Merge branch 'master' of github.com:/markllama/origin-setup

Conflicts:
	tasks/origin.thor