Merge pull request #180 from adamvi/master

Revert to updated WA_SGP_Norm_Group_Preference and add in Krissy's new B...