DOCS: bump version and update BitsPlusPlus taking control of gamma
Merge pull request #737 from peircej/master

Adding option for infinite duration sounds when created from scratch
Merge branch 'master' of github.com:psychopy/psychopy
BF: make continuous sounds from a 10s array not a 1s array to reduce ticks on loop
TESTS: sound *does* now allow secs=-1 representing infinite duration
BF: Builder (visual) components should be able to have duration = 0

Beforehand because the 'stop' only worked if not the same frame as 'start'
it meant that all visual stimuli had to appear for a minimum one frame
DOCS: changelog and P4N info
UPDATE: pyQt4 based dialogs

qtqui.py is intended to end up being a pyqt4 version of the gui.py
functionality.

Has file dialogs, base Dlg class, and some alert dialog types.
Missing the DlgFromDict class, will add tomorrow.

qtgui.py can be run as a demo script and will display each implemented
dialog type.

Only tested on Windows so far!
Merge branch 'master' of git://github.com/psychopy/psychopy
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: file name case issue on non Windows OS's
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
ENH: Added DlgFromDict

First pass now complete. Please report any issues. I've only tested on
Windows.

GUI.py demo can be run using qtgui by changing import in demo:

from psychopy import gui

to:

from psychopy import qtgui as gui
Merge branch 'master' of git://github.com/psychopy/psychopy