Merge commit 'fcfe3dce225275783f10d59786068db27a66fcdc' into feature/darpa
Squashed 'subtree/Bokeh/' changes from 81d8150..3243657

3243657 leftover merge goofs
8bfc161 Merge branch 'master' into gmap
f85e8ca adding maps 1.  calling create in backbone.js tries to create objects on the server, so I those calls for our client side only ranges 2.  I think the map needs to draw when the div is already on the screen, so I wrap the map calls inside a defer 3.  some of the serialization/deserialization was broken for plot server stuff, so that was fixed 4.  the script_injection of goole maps doesn't really work for plot server, so I just added it to the page dom.
1cad8bd interim work for gmap
58cc25a update bokehjs subtree
55f3875 Squashed 'subtree/bokehjs/' changes from 60f526c..ed6fa08

git-subtree-dir: subtree/Bokeh
git-subtree-split: 3243657c27580dc48a3a39196e889c8acb7b3847
maps
fixing pan tools for cdx map plots
plotting on top of gmap
clean up prints
ensure that map args are properly passed
using fast path
fixing _fast_path
fixing pan
adding preven default to all txt boxes so we don't reload the page
fixing selections on fastpath
fixing hold/plotting multiple things in one session
passing alpha/nonselection_alpha from cdx to plots
adding select tool
added slider
Squashed 'subtree/Bokeh/' changes from 3243657..81d8150


git-subtree-dir: subtree/Bokeh
git-subtree-split: 81d8150e56234958f461ebce61270795e9ddd6eb
merge
Revert "merge"

This reverts commit 2a4db578de81d7e40f01e693496374f097f66aca, reversing
changes made to 8dd2ced588f8eee8225ab154e16759f7a91f616b.
hand applid patch from bokehjs with circle improvements
hand applied patch from bokehjs
fixed bug where first column was being left out