DOC: Updated doc for "win" attribute.
consistent autoDraw and autoLog across _BaseVisualStim stimuli
RF: made a _logAttrib() method for logging. To reduce code redundancy.
Merge branch 'master' of https://github.com/psychopy/psychopy

Conflicts:
	psychopy/visual.py
added progress on TheEyeTribe python interface

test files are in psychopy\iohub\devices\eyetracker\hw\theeyetribe\test

* Set TEST_WITH_DUMMY_SERVER = False to test with real eyetribe server.

* run the test:

python eyetribetest.py
Expand user_variables into individual columns of the session meta data
ENH: Updated eyetribe eye tracker interface

* based on work Zaheer and I did today.
* NOT USABLE YET; but will only be another couple weeks before
integration with iohub is done and tested I would think.
Cool!
RF+DOC: basevisual minor RF, tweak comments and doc strings
DOC: comments and docstrings in basevisual.py
BF: getMsPerFrame was not passing along the showVisual request
Merge branch 'dataview'
The ip_id_num is now grouped by (experiment_id, session_id) before enumerating. This should help merging etc.
Added the ability to retain certain columns, such as ip start times, in the filtered data
Use ujson if possible
Merge pull request #7 from pedmiston/master

Improvements to InterestPeriodDefinition class
removed double openning of hdf5 when in read mode
Merge branch 'master' of git://github.com/psychopy/psychopy
Merge branch 'master' of https://github.com/isolver/psychopy
BF: cwd is changed to C:\eyegaze for calib.
BF: handling SMI FILTER_LEVEL: None