Cleaned up now-unnecessary bits of puppet config
Disable builds for prod, since it just duplicates the preceeding master build