exercise embed.py module
Merge branch 'master' into feature/tests
add tests for resources.py
Add js test for ColumnDataSource

Also took this opportunity to remove unused methods, regularize
method names on ColumnDataSource, and handle some edge cases properly
Restored 'show'
Added property name to error message
Merge branch 'master' into feature/tests
Renaming parameters to match 'frame'
More robust handling of partially intialized state on server request.

Still needs line-downsample to work though...
Basic ar image rgb working
Interpolate colors for image_rgb (draft 2; works)
temp fix for missing bs4 dep
try again for bs4
different bs4 name is on default channels
Replot function working.
Fixed box-zoom on AR; AR skips ajax requests with now screen bounds
patching function name in decorator name
population example

Conflicts:
	scripts/ocean.py
stock example
Merge branch 'master' into feature/tests

Conflicts:
	scripts/travis_install