Changed mixh0 convention so that it is set to SLHA convention and changed the call to this in the tadpoles to match.  Added routine to get the 3x3 CP odd mixing matrix from the mixing angle and beta and implemented this in tadpoles to simplify.  Added nmssm pis1s1 and appropriate subroutines which has been taken from slavic paper, matched in two independent versions by me and lewis and tested against flexi susy for random inputs, which it passes.