ef30ff2e56
Also fixes a problem with the base environment that was preventing the env-generator from functioning with the new template layout.