typo
Merge branch 'master' of github.com:bobtfish/puppet-omnibus

Conflicts:
	puppet