BF: Removed print
CONFLICT: Jon and Jonas had altered neighbouring lines in image.py

We want Jonas change to use logAttrib() and Jon's change to use
self._needTextureUpdate = False
TEST: rf to remove os.chdir()

the test in test_Experiment is being skipped, but changed it anyway
BF: makes sure that texture/image is updated after setting contrast/color

AND this should only be set once if contrast and color are both changed
(recreate texture during draw())
BF: fixed problem with setting color/contr for greyscale ImageStim

needed a new shader program to cope with the fact that ImageStim
switched to using ubyte rather than floating point pixels
TESTS: added further tests for ImageStim

checks greyscale image coloring and also numpy textures to ImageStim and GratingStim
Merge pull request #537 from jeremygray/master

TEST: rf to remove os.chdir()
RF: trim trailing whitespace (no code changes)
LOGS: fewer warnings on XML import about duplicate variable names
BF: switching between screens was only working for stimuli that come from basevisual

Was caused by the fact that python global variables are only global within
a single file! We need a separate file that supports fully global variables
ENH: ioSync API and Device enhancements

+ The ioSync mardware can be reset from the user script is necessary.

+ Default serial port setting is now 'auto', in which case the software
will scan for a connected ioSync device and use the one found. If none
are found, an error is generated. If > 1 are found, the first one found
is used.
Merge branch 'master' of git://github.com/psychopy/psychopy
BF: Removed unused visual.textbox source file.
BF: Removed currently unused TET device file
Merge pull request #538 from isolver/master

BF and ENH: ioHub related
BF: fixed problem with moviestim and glPopAttrib() (thanks Bryan Cort)

also update version 1.80.01 on win installer builder

Conflicts:

	buildExeInstaller.nsi
	docs/source/changelog.rst
ENH+TEST: remove .speex format option, more coverage of microphone.py
ENH: Updated iohub demo folder structure

+ added / cleaned up ioSync demos
BF: Window wasn't beign garbage-collected due to circular reference with pyglet on_resize
BF: removed imports of module (textbox.fontStore)

the module does not exist anymore.