Updated for new glyph model
increase socket timeout
Merge pull request #1418 from bokeh/task/test_basic_subscribe

increase socket timeout
Merge pull request #1416 from bokeh/bugfix/line-downsample-none

Updated glyph model unpacking for line downsample
Merge branch 'master' into bugfix/image-downsample-errors
Removed debugging statements