Add Math display support for qtconsole
move mergeopt to utils

from Cell
Handle sessions where the kernel has been killed
Fix failure message for tests
Fix 404 error when accessing nonexistant session
Correct comment
Add tests and fix some issues

Tests taken from #6360
make default cell type configurable

- adds IPython.notebook.default_cell_type
- default is 'code' (matching IPython 2.0)
- special heuristic values include:
  - 'selected': default to selected cell (current master behavior)
  - 'above': default to cell above
  - 'below': default to cell below
Merge pull request #6408 from minrk/new-cell-code

make default cell type configurable
Sort directory contents in test before assertion

Should fix recent test failures, but I can't replicate failure on my
computer, so it's not clear that it's fixed.
Merge pull request #6419 from takluyver/sort-test-dir-contents

Sort directory contents in test before assertion
Pull docs on defining magics out to customisation section
Fix some doc build warnings
Initial version of textbox celltoolbar ui element
Merge pull request #6425 from takluyver/docs-separate-defining-magics

Separate doc on defining magics
Rename chkb to text
Merge pull request #6326 from ccordoba12/math-for-qtconsole

Add Math display support for qtconsole
Merge pull request #6427 from jhamrick/input_ui_generator

Add textbox celltoolbar UI element generator
Merge pull request #6412 from takluyver/sessions-rest-api-fix

Sessions rest api fix
TEST: Fix invalid ast transformer in test.

The ast transformer used in test_interactiveshell.TestAstTransformError
had an incorrect method signature, causing it to raise a TypeError when
called, rather than the expected ValueError.  This change makes the test
transformer actually throw the expected error.