updates from stim computer of Sharon-2p rig
Merge branch 'master' of https://github.com/fitzlab/psychopy

Conflicts:
	Bill/lightBlocking.py
	Bill/triggers/daqIntrinsicTrigger.py
	Bill/triggers/serialTriggerDaqOut.py
	Bill/tsDriftingGrating.py
	Dan/episodicStims/driftingGrating.py