add missing package to setup.py
Merge branch 'master' of github.com:ContinuumIO/bokeh
more technically correct html/css handling of this issue
Merge branch 'master' into fix_nbviewer