classicalConditioning punishment updates

All now have punishment contingency so trials have same length
twoOdor - I have removed CS- making a valve sound; that should be
introduced into fourOdor in the future
threeOdor - big CS+, small CS+, CS- version of the task
Olfactometer testAll code

Modified from Federica - delivers odors more like the way they’re
delivered during the task