First version.
Merge branch 'master' of https://github.com/smartpurposes/puppet-modules

Conflicts:
	.gitmodules