data.py had a bug in originPath 

originPath was not returning the calling script. Instead it was returning the path that includes data.py! I realize that one would expect inspect.getouterframes(inspect.currentframe())[1][1] to return the file one up, but somehow (eg in demo_trialHandler.py) it was returning data.py. In other words, rather than one's code being saved in the "origin" field, the contents of data.py were being saved. I discovered that the first TWO entries in the inspect object, indices 0 and 1, were both the data.py path. The second entry, [2], contains the calling script. Tested in the stand-alone psychopy only.
BF: permissive US/UK spelling to allow back compatibility of monitor files

Although it was decided to go american in spelling, that shouldn't apply to
monitor calibration files that have been previously stored. Alow either
spelling and leave it as is (in case they user also has older version of
PsychoPy on the machine)
Merge pull request #747 from isolver/master

UPDATE: pyQt4 based dialogs
Merge pull request #748 from alexholcombe/patch-1

data.py had a bug in originPath
BF: bits.py should avoid importing pyglet.gl until needed to reduce wx probs

wxPython still has a problem using Choice entries if pyglet.gl has been imported
BF: allow CRS Bits# to correct gamma when generating LUT

We'll call this the 'software' gamma correction because it's controlled
by PsychoPy at run-time. The 'hardware' method will use the gamma LUT
stored on the Bits# itself (not yet implemented)
Merge branch 'master' of github.com:psychopy/psychopy
DOC: updated changelog
Merge branch 'master' of git://github.com/psychopy/psychopy