FF: need a wx.App for localization (e.g., for gui.py)
Merge pull request #656 from isolver/master

isolver/psychopy fork source updated with current psychopy/psychopy master
FF: localization catch a specific exception if no wx app
FF: fix getRAM on mac; closes #642
Merge pull request #655 from jeremygray/master

FF: a couple small fixes: need a wx.App for localization; getRAM on mac
Merge branch 'master' of git://github.com/psychopy/psychopy
ENH: 2 missing files from last commit

initial files for psychopy side iohub device wrappers.
ENH: Update kb and mouse demos

so they run with iohub 2 related changes committed