Update to iohub test script
Merge remote-tracking branch 'origin/master'

Conflicts:
	psychopy/tests/test_iohub/test_launch.py