Updating puppet module
Moving some more configs around