fix @mget/@get mixup
Merge branch 'master' of github.com:ContinuumIO/bokeh
Simplify deploy options

Just provide "grunt deploy" that always builds both minified and
unminififed bokeh[.min].js output so that users trying to get set up do
not have to worry about which one to use.
Merge branch 'master' of github.com:ContinuumIO/bokeh