Updates to setup and puppet modules