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
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.
increase registration timeout

to highest of 10 seconds or 5 heartbeat periods

Should reduce stalled registration notices (#2996)
fix time format to international time format

use the ISO 8601 standard
see http://en.wikipedia.org/wiki/ISO_8601#Times
on resume, print server info again

This commit makes it possible to differentiate between many different
long-running notebook servers, where the original ip address and port
information printed at the beginning has scrolled out of the screen.

We save the server location string that gets printed on startup, and
re-print it when the user attempts to interrupt the server with Ctrl-C

Thanks to @minrk for discussion on how this should work.

Also added a docstring to the start() method
Merge pull request #3032 from olivierverdier/dateformat

fix time format to international time format
log the notebook server directory

suggestion provided by @Carreau
make SIGUSR1 and SIGINFO trigger printing of info

Directory and url/port information for the notebook server is now
printed when it receives one of these signals. SIGINFO is available only
on BSD-based systems, and is triggered via Ctrl-T.
remove xml from notebook magic docstrings

closes #3035
Merge pull request #3038 from minrk/noxml

remove xml from notebook magic docstrings
cast kernel cwd to bytes on Python 2 on Windows

Popen on Windows Python 2.x apparently cannot handle unicode cwd.
use filesystemencoding if defined, fallback on ascii.

closes #3039
add width:100% to vbox for webkit / FF consistency

closes #3049