Thinking about this a little more, what do you think about removing the `--notebook` option fmor the bokeh magic, and having `output_notebook` load the magic? I do like having the parallel between `output_file`, `output_server` and `output_notebook` also even in the notebook you sometimes need to be able to supply a server url as a parameter.