fixed #162
Merge branch 'jsmergemerge' of github.com:ContinuumIO/bokeh into jsmergemerge