Merge branch 'master' of git://github.com/psychopy/psychopy
DOCS: fixed some typos and updated links in ioHub docs
Merge pull request #2 from brian-lau/master

Thank you Brian!
ENH: Added getPressedKeys() to Keyboard device

Return the set of currently pressed keys on the keyboard device and the
time that each key was pressed, as a dict object ( dict key == keyboard
key, dict values == associated keypress time for each key).

Modifier keys are not included even if pressed when this method is
called.
Merge branch 'master' of https://github.com/isolver/psychopy
BF: gevent 1.0 prod release compat issue

In gevent 1.0 (non RC) gevent.run() is no longer available; so scripts
using iohub code failed when this version of gevent was used. Now fixed
and still supports gevent 1.0xx .run() as well.
Merge pull request #483 from jeremygray/master

shorten travis log outputs
Merge pull request #482 from isolver/master

ioHub Update
TEST: log=False in more places

- add log parameter to microphone, web
- trim whitespace in emulator.py