use upstream
add upstream docker module
Merge branch 'master' of github.com:XANi/puppet-modules

Conflicts:
	modules/docker