Merge pull request #768 from isolver/master

BF: iohub YAML file sytax error
Merge branch 'master' of git://github.com/psychopy/psychopy