Added "incrementOnAbort" option to trial
Update to tactor code
Merge branch 'master' of https://github.com/JasonFriedman/RepeatedMeasures