Clean up puppet::master and fix dependencies in puppet class