changes to use bokeh.js, also a legend fix for new legends with no annotationspec