Update to create subset for matrix creation
Update WA norm group preference
Update to Adams branch
Update of SGPstateData
Merge pull request #662 from dbetebenner/master

Merge of Adams branch and additional pieces