Merge pull request psychopy#1771 from dvbridges/ioHub

BF: Further fixes for ioHub demos for Py2 and P3 compatibility.

Merge pull request psychopy#1697 from hsogo/master

Remove install_aliases() to fix automatic import of "test.py" issue

Merge pull request psychopy#1615 from hsogo/feature-wx4

FF: fixing bugs with closing splash and running experiments in Windows wxPython4

Merge pull request psychopy#1522 from hoechenberger/exp-handler

FF, DOC: Don't hard-code CSV field separator in `ExperimentHandler.close()`

ENH: cont. small change to allow monitors to be saved in json as well…

… as pickle

Although this breaks the rule of only bug fixes, it is going to be helpful
in a smooth transition to Py3 versions (which won't be able to read the
Py2 pickle calib files)

The aim here to to save calib files as json files when the user opens
monitor center so that in future they can be read instead. When the user
presses save then both formats will be saved (for now)

BF: return focus to the main window after closing tools>update dialog

The problem was that we were doing Destroy() rather than Close() on
the dialog

BF: app shortcut should not include app version#

easy_install used to install egg with versino number included
but pip install is now used and that doesn't include version number

Merge pull request psychopy#1358 from peircej/master

FF: Added psychojs.zip to win32 release (wasn't being include)

Merge branch 'master' of https://github.com/psychopy/psychopy

Merge pull request psychopy#1347 from peircej/master

FF: fixed issue with Builder html templates not being found