modfied main.cpp and def.cpp to better match master branch.
softsusy.cpp reset the way the charged and cp odd higgs are calculated, which should only change physical(0) calc, not physical(3).