Merge branch 'master' of https://github.com/boxen/puppet-dockutil
Merge branch '4'

Conflicts:
	manifests/init.pp
	manifests/item.pp