Feature/jrbl/prod cleanups

an extension of the partial cms setup (not really much more done to set that up yet, I'm afraid), with a couple nickel and dime fixes needed on the vpc hosts to be (hopefully) prod worthy