added nmssm two loop tadpoles to doTadpoles.
Set mS'^2 to m0^2 in the universal scalar GUT condition
Add standardSugra() for the NMSSM (need to set Al = Ak = A0)
revert commit 522198 because mS'^s is not a soft scalar mass
Merge branch 'nmssm2' into read-nmssm-slha