pulled ale's revisions.
In softsusy class split content of pis1s1 into new methods which it calls, to allow greater code reuse in the NMSSM version.