modified termination conditions in ServoDrive
Merge branch 'master' into OfficeCopy
removed extra trigger at expo start
Matlab expts can run image sequences now.
R4 line giving expo types was invalid format. So now have exptype=NaN on these lines to encode exptype
swap uses nstim[6] to count trials left.
plaid angle = 90 now sets checker to 2x 1D instead of index 2D