Deprecate bokeh.{objects,glyphs,widgets}

Use `bokeh.models` (and its submodules) instead.
Looks like I messed up merge in this case.