Moving master attributes to init for masterless setup
Merge branch 'master' of https://github.com/Proteon/puppet-puppet