Some minor changes to allow better puppet master bootstrap
Changed repo to puppetlabs
Clean up code