Merge pull request #327 from isolver/master

BF: Replaced iohub eye_tracker demo update
Merge branch 'master' of git://github.com/psychopy/psychopy