Merge commit 'fc6d41c682392b7de45129de398a19fac57b0938'

Conflicts:
	subtree/Bokeh/bokeh/server/serverbb.py
	subtree/Bokeh/bokeh/server/start.py
	subtree/Bokeh/bokeh/server/views/backbone.py
	subtree/Bokeh/bokeh/server/views/main.py
	subtree/Bokeh/bokeh/session.py
	subtree/Bokeh/examples/glyph2.py
forgot to resolve some conflicts from before
better callback handling so that we don't bind the same callback twice
ordering information for column data source
old pandas tables working with new object system
 bokehjs now seems to work properly after the merge
 selections sort of working
- now we can control whether we filter selected data
determine "selected" concept in dataframe based on underlying data
clear selection functionality
nice handling of lengths of datasets
properly displaying length information
Merge commit 'fa1ce5d3a51f0eed5d650c3604f92f659108e6d7'
need to prune models before sending data to web browser
need special load_json function for guides
made select tool work again re-added box selection overlay had to move bind_bokeh_events out of delegateEvents - now it is only called after build_views
Squashed 'subtree/bokehjs/' changes from 323b60f..9404d1a

9404d1a  now both tests and demos tempaltes link back to root
c4e95a8  added test list to the welcome page
210df28  basic landing page
b0a4adf Updating README
2d8abba remove cruft
e81a594 tighten up auto_interval return, and add a few tests
e0775bc a few ticking tests
7c40fc7 more test tweaks
fac6f5a fix allpossibletests target
2308498 fix some tests
bc024a7 add try_active_tool trigger for passively triggered tools to try and become active
25ca2aa some filename/naming consistency
f8d89af minor improvements to resize too
0dc88fc much improved resize tool and some css tweaks
ed74f71 some tool refactoring to make it easier for tools to draw
eab8b1d some changes to accomodate tool views
9a879f9 some cleanup for PlotView, reorg as render_init, render_canvas, and render
8567747 first cut of a resize tool
0b077e4 fix typo

git-subtree-dir: subtree/bokehjs
git-subtree-split: 9404d1adfd972d97a84d416bddccbc3762fa5fb2
Merge commit '7f18508ef3b5ed7c26d1ea77ce64e703625ab0d5'

Conflicts:
	subtree/bokehjs/static/coffee/common/plot.coffee
	subtree/bokehjs/static/coffee/common/view_state.coffee
	subtree/bokehjs/static/css/bokeh.css
made selection tool work again re-added box selection overlay moved bind_bokeh_events out of delegate_events - its' reserved binding events on plot widgets, since they might need other components of a plot
Merge commit 'e1af62b32973e1d4a42c95cb73383f50e96163bb'

Conflicts:
	subtree/Bokeh/subtree/bokehjs/static/coffee/common/plot.coffee
	subtree/Bokeh/subtree/bokehjs/static/coffee/tools/activetoolmanager.coffee
	subtree/Bokeh/subtree/bokehjs/static/coffee/tools/tool.coffee