Merge pull request #192 from adamvi/master

Updates for 2014 GA analyses and merge conflict fix
Merge branch 'master' of github.com:CenterForAssessment/SGPstateData