Trying to exile the CMSSW environment based bits into subshells so as
not to bugger stageout...
Evidently changed some things in the main repository...

Merge ssh://github.com/DAMason/Plonk