Merge branch 'master' of git://github.com/psychopy/psychopy
RF/ENH: attributeSetters for ElementArrayStim.
Only slightly controversial thing is removing the docstring from setColors() and referring to other stimuli. It's essentially duplicated.
RF: unified docstrings on color.
Merge branch 'master' of git://github.com/psychopy/psychopy
RF: changed demos/tests to use attributeSetters for ElementArrayStim.
RF: updated demos to use attributeSetters and consistent ['escape', 'q'] for quitting.
BF?: colorSpace change to make Travis happy.
BF? A few additions to the make-Travis-happy attempt. Now that colorSpace and color can be set seperately, colorSpace=None does not make much sense anymore and should be captured as an error in anything but the old setColor(color, colorSpace).
ENH: improvements on face_jpg demo?
DOC: changed some comments
BF: consistent handling of logging.
Merge branch 'master' of git://github.com/psychopy/psychopy into fix-logging

Conflicts:
	psychopy/visual/basevisual.py
	psychopy/visual/window.py
BF+RF: fixed bug in Window.color.
Refactored setWithOperation with faster default and better exception handling
Began working on autoLog=None.
BF: oops...
RF/BF: logging for colors. Moved logging out of helpers.setColor.
DOC: updated docstrings and comments regarding colors
RF: log=None in BaseVisualStim
RF: created setAttribute() function which will eventually replace setWithOperation() and callAttributeSetter() with a few bugfixes/enhancements.
RF: move BaseVisualStim. to setAttribute(), deprecating _set().
RF: use setAttribute() instead of setWithOperation() and callAttributeSetter() and sometimes logAttrib().
The idea is to just have setAttribute() for set*() methods and @attributeSetter for attributes.