FF: forgot to import numpy for monitorunittools
FF: minor fixes to window to handle corner cases of new units and shaders code
FF: new buglet in window creation from Builder when units are not from prefs
DOCS: updated version ready for release
ENH: Builder moved info dialog stuff to Component Settings>BasicSettings

Also added documentation about data filename
FF: rewritten and tested deg2cm with support for flat-correction
FF: forgot to add numpy imports to handle new deg2cm with correctFlat=True
FF: still didn't get the import of numpy functions correct
Merge branch 'master' of git://github.com/psychopy/psychopy

* 'master' of git://github.com/psychopy/psychopy:
  FF: still didn't get the import of numpy functions correct
  FF: forgot to add numpy imports to handle new deg2cm with correctFlat=True
  FF: rewritten and tested deg2cm with support for flat-correction
  ENH: Builder moved info dialog stuff to Component Settings>BasicSettings
  DOCS: updated version ready for release
  FF: new buglet in window creation from Builder when units are not from prefs
  FF: minor fixes to window to handle corner cases of new units and shaders code
  FF: forgot to import numpy for monitorunittools
  DOCS: changelog
  ENH: added 'degFlat' and 'degPosFlat' units options for stimuli
  REF: refactored convertToPix() to use a dict of functions (Sol's idea)
  ENH: plaid demo should use blendMode='add'
  FF: in Builder, for blendMode='add' you also need useFBO=True
  FF: blendMode='add' wasn't scaled correctly - needed adjustment to shaders
  ENH: Builder timing now stops at t-win.monitorFramePeriod*0.75 rather than t
  BF: visual.py should have the openWindows list in its namespace
  ENH: Builder ExpSettings now supports blendMode=add/avg but the FBO isn't working correctly
DOCS: parallel port docs were breaking documentation build
FF: ElementArrayStim now handles new degFlat and degFlatPos units
ENH: SMI interface now supports sendCommand(...)
Merge branch 'master' of git://github.com/psychopy/psychopy
BF: iohub mouse.getPosition when no mouse events

Fixed the iohub Mouse device's getPosition() to handle being called
before any mouse events are received by iohub. This will be rare, but is
technically possible.

Now, if no events have yet been received, mouse.getPosition() gets the
current mouse position by querying the OS.
BF: keyboard/mouse event window_id field on Linux

Keyboard and Mouse event code has been updated to work on more Linux
distro's and / or with PyXlib 0.14 as well as 0.15 in terms of getting
the current in focus window id.
ENH: iohub 'report_system_wide_events' on Linux

The iohub setting 'report_system_wide_events' for the Mouse and Keyboard
devices now works on Linux as well.
ENH: Removed 'dummyserver', updated eyetribe py
FF: various fixes to degFlat and degFlatPos unit conversions picked up by new tests

- make sure that pos and vertices are numpy arrays
- make sure that returned vertices have datatype 'd' (not 'f') or shapes go wrong
- cleaned up code for using these units with Text and SimpleImage, which had
additional references to unit code in their bodies
TESTS: Added tests for the new window units, 'degFlat', 'degFlatPos'

Also fixed minor discrepency in returned fit params for naka-rushton
TESTS: relaxed tolerance on fit naka-rushton

(32bit mac and 64bit linux come to slightly different optimum)