added puppetconf adm
Merge branch 'master' of https://github.com/puppet-be/puppet-be.github.com