Merge branch 'master' of github.com:justin8/puppet

Conflicts:
	.gitmodules