Squashed 'subtree/bokehjs/' changes from 9467c8b..ee31e35

ee31e35 merged
7ee6f57  the built bokeh namespaced bootstrap is now at v.2.0.4 which is the same version of bootstrap we originally used
c9247de performing html escaping in js
15c48f3 Fixed unit test.

git-subtree-dir: subtree/bokehjs
git-subtree-split: ee31e35ed160cb023abacb4719d81a8775326a13
Merge commit '5626568d65a5a938702826f220e70ed4fc68aea3'