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

Conflicts:
	psychopy/tests/test_iohub/test_launch.py
merge conflict
removed prints
another iohub test change. WTF.
BF: moviestim2 sets default framerate

if win.getActualFrameRate() returns None, moviestim2 assumes 60 fps.
Merge pull request #672 from isolver/master

REMOVING PINTS OCCURRING DURING IOHUB INIT.
iohub test now skipped if running on travis
Merge pull request #673 from isolver/master

iohub test now skipped if running on travis
ENH: Added video file exists check
ENH: allow the psychopy app to --run a python script without loading the app interface
removed bad character
BF: iohub can now be used via Coder on OS X 10.9

PsychoPy2 app must be added to the list of authorized apps for
accessibility in the security pref’s of the computer. Then iohub
keyboard and mouse support can be used.
ENH: Further work on iohub kb device OSX updates
BF: Removed testing prints
Added psutil 2.x compatibility fix
Merge branch 'master' of https://github.com/isolver/psychopy
ENH: remove log calls in ratingscale.draw()

was logging setting units every frame
ENH: Added current state of GP3 eye tracker imp.

No complete. Can connect, start / stop record, parse sample events.
Thanks to Martin Guest for his effort in getting the GP3 this far along.
win32 keyboard updates

normalizing key and char values across OS's