Merge branch 'master' of github.com:wl4n/puppetlabs-mongodb

Conflicts:
	manifests/globals.pp
Merge branch 'master' of github.com:wl4n/puppetlabs-mongodb

Conflicts:
	manifests/globals.pp