Fixed quarentine/ipy_editor.py so that it (0) uses string formatting instead of some old old 'itpl' module (1) doesn't use the deprecated ipyapi, (2) fully pep8 compliant, (3) better docstring
tried to fix idle
rename the file to lib/editorhooks.py and chance string template to {} formating
editorhooks working with qtconsole
backing out changes to the zmq shell stuff
back out one more little edit from before
Using pipes.quote
Merge branch 'editors' of github.com:rmcgibbo/ipython into editors
Refactor qt import logic. Fixes #2955
time magic: shorten unnecessary output on windows

On windows the detailed info (i.e. cpu time) is not available and
always reported as zero. The rest of the information is therefore
redundant with the next print (wall time) and can be omitted.
added QT_API_DEFAULT Qt option. Fixed reversed MPL qt logic test.
fix run-all (that-> this)
Merge pull request #2983 from Carreau/fix-run-all

fix run-all (that-> this)
fix local files examples in markdown
expanduser on %%file targets

closes #2993
Merge pull request #2994 from minrk/expanduser

expanduser on %%file targets
fix typo in DictDB.size_limit

limit meant to be 1GB, but typo made it 1MB
add DictDB to autogenerated config / help

for cull fraction, etc.
fix css in .output_area pre

font: inherit conflict with monospace, wich in some cases
leads to non-monospace font (nbviewer for example)
increase registration timeout

to highest of 10 seconds or 5 heartbeat periods

Should reduce stalled registration notices (#2996)