Include version '2.0.0-wakari'
Merge pull request #743 from chdoig/patch-1

Include version '2.0.0-wakari'
fix https://github.com/ContinuumIO/bokeh/issues/729
Squashed commit of the following:

commit 74401ed3c89d92d66995e2c31eb3624c2bb5cb9d
Author: hugo <hugo>
Date:   Wed Jul 2 07:43:59 2014 -0400

    syntax errors and bugs induced by adressing PR comments

commit 5465cc7c078426b61f770f7e791ba14bb7be78fe
Author: hugo <hugo>
Date:   Mon Jun 30 16:45:30 2014 -0400

    typo earlier

commit aa438bd8c7702af4622ef8ce190cf1d14e60be12
Author: hugo <hugo>
Date:   Mon Jun 30 13:54:14 2014 -0400

    file was added on accident somehow during a merge from master

commit 7c90a93d0a3e7b539d75eea3f238a5e14f173335
Merge: e67f779 0ed9bbe
Author: hugo <hugo>
Date:   Mon Jun 30 13:44:28 2014 -0400

    Merge remote-tracking branch 'origin/master' into feature/crossfilter

commit e67f779fa1dfe941cf8b2f4263ece21eaae57402
Author: hugo <hugo>
Date:   Mon Jun 30 13:44:02 2014 -0400

    making 0.7 as bar width clearer

commit ed7a731fa4a5a07f07dce4317b2d03e359a0a9b6
Author: hugo <hugo>
Date:   Mon Jun 30 13:43:50 2014 -0400

    removing old commented-out css

commit c61bbb9e787c96bb6098b1df0b06d28d75459a67
Author: hugo <hugo>
Date:   Mon Jun 30 13:33:02 2014 -0400

    comments by @damianavila

commit cd1d9d8d8a78e4112ea8ebccb9ce78017ac1102d
Author: hugo <hugo>
Date:   Fri Jun 27 10:35:10 2014 -0400

    extra release files, accidentally added by me

commit bd9287a25856b333ae8ad8967f9a3afe5a1cd711
Author: hugo <hugo>
Date:   Fri Jun 27 10:33:02 2014 -0400

    removing file which accidentally got added during some merge?

commit 2e13f232a2a97693d874aa1e15e5dac3a5d9d233
Author: hugo <hugo>
Date:   Fri Jun 27 10:30:23 2014 -0400

    using master bokehjs release files so that the diff is more easily viewable

commit 82c26531da128cc0afcd550ac11c170accd008e1
Author: hugo <hugo>
Date:   Fri Jun 27 10:19:45 2014 -0400

    cleanup to segregate crossfilter stuff to separate directory

commit 905a9fe8b19c5ac9c7495f4d81b95ab7a0544831
Author: hugo <hugo>
Date:   Fri Jun 27 10:11:16 2014 -0400

    addressed issues with updating to master

commit 00ffea8e92fc43579d073029203aac332cae18d4
Merge: ee50837 3600527
Author: hugo <hugo>
Date:   Thu Jun 26 10:40:06 2014 -0400

    Merge remote-tracking branch 'origin/master' into feature/crossfilter

commit ee50837559917e32d0c48253cff770cfd5bf014e
Author: hugo <hugo>
Date:   Thu Jun 26 10:40:01 2014 -0400

    bk toolbar button classes

commit e8af58304729d234d79c235cc2af31e9dd3027f0
Author: hugo <hugo>
Date:   Sun Jun 22 07:48:22 2014 -0400

    fixing crossfilter for new css

commit 4c1b123658413e80ef64d3a97a0f978e04119215
Author: hugo <hugo>
Date:   Sun Jun 22 07:47:52 2014 -0400

    fixing less watching

commit 10d495f4bd43f5617ffcb0f154ce378714888524
Author: hugo <hugo>
Date:   Sun Jun 22 07:16:12 2014 -0400

    css matching bootstrap refactor

commit e97066367b7b593367b77046412b467b07aa766e
Merge: 4496392 187a964
Author: hugo <hugo>
Date:   Sun Jun 22 05:56:50 2014 -0400

    Merge remote-tracking branch 'origin/master' into feature/crossfilter

    Conflicts:
    	bokeh/server/templates/_base.html

commit 44963929105f5dabaca1584cdf8104f86ea7e244
Merge: effe82f 6ca27fb
Author: hugo <hugo>
Date:   Wed Jun 11 04:24:52 2014 -0400

    Merge remote-tracking branch 'origin/master' into feature/crossfilter

    Conflicts:
    	bokeh/server/__init__.py
    	bokeh/server/templates/_base.html
    	bokeh/widgetobjects.py
    	bokehjs/Gruntfile.coffee
    	bokehjs/src/coffee/common/base.coffee
    	bokehjs/src/coffee/common/plot.coffee
    	bokehjs/src/coffee/tool/event_generators.coffee
    	bokehjs/src/coffee/tool/hover_tool.coffee
    	bokehjs/src/coffee/widget/selectbox.coffee
    	bokehjs/src/less/main.less
    	bokehjs/src/less/widgets.less

commit effe82fd7b366cfe699c18fe7757bf349dc9762e
Author: hugo <hugo>
Date:   Thu May 22 16:57:05 2014 -0400

    Release files

commit 2123bacf1a3d2fc792e1252fc511a35b0676ae68
Author: hugo <hugo>
Date:   Fri May 16 19:15:16 2014 -0400

    facetting of continuous vars

commit 3f2a8469e87b81dfc32d278fcdf61dafe2a0f3bd
Author: hugo <hugo>
Date:   Fri May 16 13:34:54 2014 -0400

    layout fixes

commit 851968caf766febf186183df5b8b71d5b4e4eba2
Author: hugo <hugo>
Date:   Fri May 16 10:21:53 2014 -0400

    fixing plot widths/heights

commit 918c2089122b71893a11655376ec27ac586b3467
Author: hugo <hugo>
Date:   Wed May 14 20:32:11 2014 -0400

    2d scatter plots

commit 57431dd012dae66af0e8b58843535573d2f1a229
Author: hugo <hugo>
Date:   Wed May 14 20:21:21 2014 -0400

    basic gridplots

commit 51caef3bb649c916ed48b8d14f2720b5da75783a
Author: hugo <hugo>
Date:   Wed May 14 18:35:59 2014 -0400

    discrete bar plots

commit 1822791e22f42c9cdd72aeba4e905679d37e6271
Author: hugo <hugo>
Date:   Wed May 14 16:04:01 2014 -0400

    checkpoint

commit 0c06474c86b1ae9b14cd85ecaa07fa1e8dba2388
Author: hugo <hugo>
Date:   Mon May 12 23:25:48 2014 -0400

    adding titles and fixing plot type selection

commit a46b16da81d5de42dee665c4904e9057acc6e161
Author: hugo <hugo>
Date:   Mon May 12 22:38:11 2014 -0400

    finished facet selector and basic plot attribute selection

commit e33bc7232b6590ed4e5962a1d823be8724d3a6d1
Author: hugo <hugo>
Date:   Mon May 12 16:48:14 2014 -0400

    added close wrapper for removing filtering widgets

commit f4595b533d115ba93099a2decae4bb2e662e4d29
Author: hugo <hugo>
Date:   Mon May 12 16:47:59 2014 -0400

    multi select input widget

commit f63fe4e7a968277dce67ed09fbaae8f27a86872f
Author: hugo <hugo>
Date:   Mon May 12 12:31:45 2014 -0400

    fixing tests - set params on settings, rather than passing in args

commit bd7b0b4827b428b7ed8c8951094ab1d09a42b8db
Author: hugo <hugo>
Date:   Sun May 11 22:45:46 2014 -0400

    basic crossfilter widget, still WIP

commit 6e61cb68a7fe81e07e01eff0698731022a01c63a
Author: hugo <hugo>
Date:   Sun May 11 22:45:21 2014 -0400

    added css files to bokeh server restarter watching

commit 4a852f19a0473a27d177ba2804b3fbfa4fcec99e
Author: hugo <hugo>
Date:   Sun May 11 22:44:25 2014 -0400

    removed padding on button bar

commit a812347ce22cbe917dfe402e1c60555f16a85351
Author: hugo <hugo>
Date:   Sun May 11 22:43:51 2014 -0400

    added to_df method on ColumnDataSource
    enabled x_select, y_select on box selection tool (Range selection)

commit 68ef9db57452bee7b035de6f2dee434359193b31
Author: hugo <hugo>
Date:   Sun May 11 22:43:27 2014 -0400

    added none option to border_symmetry

commit c1a5c5a88442fe8de362207b650cac15ce6ea72b
Author: hugo <hugo>
Date:   Sun May 11 22:42:58 2014 -0400

    - clean css during less watch
    - added clean:css task

commit 4ed83291d1fbb7dadf35c512dd82777c9ffafb46
Author: hugo <hugo>
Date:   Sun May 11 12:53:19 2014 -0400

    initial objects created

commit 172ed697b0957109c09478000598ba94b2098222
Author: hugo <hugo>
Date:   Sun May 11 12:47:36 2014 -0400

    decorator which allows you to turn an object into a page inside the bokeh server
Merging master...