Merge pull request #193 from dbetebenner/master

Pulling in changes from Adam and cleaning up spaces in SGPstateData