Update to split puppetmaster away from normal puppet