Cleaned versions of my parts of the code in softsusy.{h,cpp} and nmssmsoftsusy.{h,cpp}.  Also contains changes from merge with Peter - amsb ; nuhmINM ; nuhmIINM ; extendedNMSugraBcs (all in nmssmsoftsusy), and hack to charged Higgs to match MSSM limit of NMSSM code (softsusy.cpp).  Naturally, I saw deviations in the softpoint.x output compared against my pre-merge output, but these went away once I reset Peter's changes to the charged Higgs mass