merge master
Merge branch 'task/update_examples' of github.com:ContinuumIO/bokeh into task/update_examples