Merge branch 'master' of github.com:arusso/puppet-puppet