fix repo merging
Merge branch 'master' of github.com:XANi/puppet-modules