Clean up code
Remove options(warn=2) from testSGP(4)
Clean up
Logic and if statement cleanup
Update parallel.config logic
Fix merge conflicts and update to Damian's branch
Fix typo
Update UT SGP Norm Group Preferences
Update/Correct UT SGP Norm Group Preferences
Merge pull request #700 from adamvi/master

Minor fixes and update UT Norm Group Prefs