Merge branch 'master' of git://github.com/psychopy/psychopy

Merge: should fix testing?
git push origin masterMerge branch 'master' of git://github.com/psychopy/psychopy
Merge branch 'master' of git://github.com/psychopy/psychopy
Merge branch 'master' of git://github.com/psychopy/psychopy
DOC: updated overview of visual module
BF: monitor gamma didn't return to original value when script crashes and call Window.__del__
RF: attributeSetter Aperture.enabled for Aperture.enable/disable.
RF: attributeSetters for Aperture properties "ori", "pos" and "size".
RF: attributeSetter for BufferImageStim "flipVert" and "flipHoriz".
BF: uninformative handling of error if BufferImageStim had non-list "stim" argument.
RF: attributeSetter for Circle.radius.
RF: attributeSetter for DotStim.fieldPos.
RF: added attributeSetter for DotStim.coherence
RF: added attributeSetter for DotStim.dir
RF: control attributeSetter's logging by adding an autoLog arg to setWithOperation.
Gives better reuse of code between stim.attr and stim.setAttr()
ENH: all parameters of DotStim can now be altered after stimulus initiation.
(except fieldSize)
RF: moved doc of Circle.radius to attributeSetter
RF/ENH: attributeSetters for ImageStim
BF: revert error in Window.__del__. Not fixed. Just not worse.
Merge branch 'master' of git://github.com/psychopy/psychopy