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