change submodules to r10k
Merge branch 'master' of github.com:0rph3us/puppet-conf