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.
RF: reduce os.chdir calls, initial commit

- sometimes get a test failure with os.getcwd() failing, seems like maybe an earlier chdir left
  things hanging
- info.py not changed

RF/BF: remove chdir from info._getHashGitHead

- BF = enable default directory to work

RF+BF: always use absolute path for data file in Builder scripts

- needed after removing os.chdir prior to running a script from builder.py / experiment.py
  IMHO always working with abs paths is an improvement
- allow user to specify a relative or absolute path is settings:
  use the users's explicit abs path if its abosolute, otherwise use the abspath of the script's dir
- BF: handle case of user deletes data file name

RF: smoother handling of missing datafile name in settings

RF: ensure expected cwd from inside builder scripts

FF: info.py getting git-hash of psychopy

TEST: new test of info.py

RF: remove commented-out code having os.chdir
TESTS: trying to reduce logging output
RF: minor code cleanup in app start (no need to detect admin)
TEST: test configuration and benchmark wizard
TEST: slightly more coverage of wizard.py

- may try to launch a web-browser, not sure if one is installed on travis-ci
BF: accept more diverse forms of locale as preference

- use locale.locale_alias to map them
- can now accept 'danish' --> 'da_DK'
BF: manually compiled scripts need a name too

- otherwise get an error when try to run a script in coder that was compiled in Builder view
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.