Changes to set in GAMS intensities from previous run, as starting point.  Also changes for dry matter, and some tidy-up.