update of treadmill and shrew stimulus code
Merge branch 'master' of https://github.com/fitzlab/psychopy

Conflicts:
	Dan/episodicStims/driftingGrating.py