Add TCRP Norm group prefs and other changes for TCRP
rename 'sgp.iter' when used as an integer for indexing to avoid confusion with sgp.iter lists elsewhere
make sure tmp.lookup is ordered correctly.  Was re-ordering a grade progression (6, EOCT, 8) to (EOCT, 6, 8)
Ensure lookup table is ordered by years
Fix merge conflicts
Merge branch 'master' of github.com:CenterForAssessment/SGP
Add TCRP baseline matrices and update norm group prefs
Merge pull request #479 from adamvi/master

Add TCRP Norm group prefs and other changes for TCRP