TESTS: fix to the test of ipython import
BF: iohub Touch Device OS X fixes.

+ some general usability fixes in the touch device demo.
Merge branch 'master' of git://github.com/psychopy/psychopy