changed intertrial constant to 1500
changed response window calculation to be based on nFramesCoh as upper limit
Check in some changes that were sitting around on s2

These really should have been explicitly checked in previously.
Update builds