Squashed 'subtree/bokehjs/' changes from faf8d0c..f3d4541

f3d4541 more cdx references
1cd9a5e ggplot works with new ported cdx
51b5eb5 initial merging of all the cdx stuff

git-subtree-dir: subtree/bokehjs
git-subtree-split: f3d4541632ffa802865b322e25b240e2219f76e6
Merge commit '8cdfd77f21a3c05b82cbdff0f2e5e3fb12d14488'