Fix missed merge conflict
Merge branch 'master' of github.com:CenterForAssessment/SGP
Simlify setup of tmp.traj to avoid NA values in STATE.
Merge pull request #611 from adamvi/master

Simlify setup of tmp.traj to avoid NA values in STATE.