ENH: switching wx.Color to wx.Colour (for compatibility with wx 2.9.xx)
ENH: Window sends a 'stay awake' signal during flip (win32 and OSX)
FF: cedrus button box code generation from builder
BF: further fix to the extra file-close query dialogs
BF: minor change to installer package
ENH: Custom labels for OK and Cancel buttons in gui.Dlg
Merge pull request #448 from frankpapenmeier/master

ENH: Custom labels for OK and Cancel buttons in gui.Dlg
Merge branch 'master' of git://github.com/psychopy/psychopy
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