Merge pull request #71 from dbetebenner/master

Addition of scale score lookup for MA and merge with Adam branch
Revised GA social studies and US history matrices
Merge pull request #72 from adamvi/master

Revised GA social studies and US history matrices