Merge pull request #120 from williamhogman/upstream

BF: DataHandler.addDataType no longer tries loop over unicode strings
DOC: removed multiflip from documentation and fixed some EOLs
BF: Window.setColor didn't know how to scale different spaces correctly

if named colours or RGB255 then should not be /2+0.5
BF: fixed (unimportant) erroneous error message about combining hex colors
Merge branch 'master' of github.com:psychopy/psychopy
Fixed bug in which fieldPos of Builder dot stimulus component couldn't be changed each frame

fieldPos attribute of Builder dot stimulus component couldn't be
changed each frame. Due to differences between handling of this
attribute called fieldPos as opposed to simply pos in the patch
stimulus.
Also fixed some typos in a tool tip for the patch stimulus hints and in
one code comment.
Merge pull request #122 from m-macaskill/master

Fixed bug: fieldPos of Builder dot stim couldn't change per frame
BF: Fix errors in sanity checking of "flips" argument.
DOC: added info on running developer-version
DOC: updated formatting
DOC: added motivations.
Merge pull request #123 from lindeloev/master

DOC: info on how to run local git version
RF: cleaned up opengl code to use pyglet only. Removed GLUT backend

- all calls to GL, GLU and GL_multitexture go to pyglet.gl
- the GLUT backend has been removed entirely
	(and whenIdle(), go(), fullScr() which only worked for glut backend)
Unicode for saveAsWideText function

Added UTF-8 encoding to the TrialHandler's saveAsWideText function.
In response to mailing list request by Robert Busching, 26 Mar 2012.

NB there is now some duplication between the same-named function in
both the TrialHandler and the ExperimentHandler classes.  Inevitably,
duplication leads to inconsistency problems like this.  Also the
appendFile parameter defaults differently in each version of the
function, which might cause problems.
saveAsWideText() needs to stay as a function of the TrialHandler for
those people who may be using it in the Coder, and who aren't using the
ExperimentHandler class, but the function is now just a special case of
the (more capable) function in the Experiment Handler.  Can the two be
reconciled so that code duplication is minimised?
Revert "Unicode for saveAsWideText function"

This reverts commit 6fd8f803c906a877c2e43339e9cd1180f14449cd.
Unicode for TrialHandler's saveAsWideText function

Added UTF-8 encoding to the TrialHandler's saveAsWideText function.
In response to mailing list request by Robert Busching, 26 Mar 2012.

NB there is now some duplication between the same-named function in
both the TrialHandler and the ExperimentHandler classes.  Inevitably,
duplication leads to inconsistency problems like this.  Also the
appendFile parameter defaults differently in each version of the
function, which might cause problems.
saveAsWideText() needs to stay as a function of the TrialHandler for
those people who may be using it in the Coder, and who aren't using the
ExperimentHandler class, but the function is now just a special case of
the (more capable) function in the Experiment Handler.  Can the two be
reconciled so that code duplication is minimised?
Merge pull request #124 from m-macaskill/ec4c108ba7dd8cb2418db6a89bed0803dc9f5831

Adding UTF-8 to TrialHandler saveAsWideText() function