Merge pull request #472 from adamvi/master

Revised Social Studies and US history baseline matrices
Refinement of scale score lookup code
Merge pull request #473 from dbetebenner/master

Refinement of scale score lookup code
Merge branch 'master' of github.com:CenterForAssessment/SGP