remove some unused comments from tests
delete notebook mapping in shutdown_kernel
add manager and client as trait lets of ZMQInteractiveShell

required adding **kwarg passthrough in InteractiveShell parents
remove unused notebook heartbeater
fix in process qt and in process examples
change how failed restarts are detected

makes it harder to mistake a quick restart from real failure
restart channels on kernel restart

generally not necessary, but sometimes the kernel connection can be dirty.
We have only seen this by starting a qtconsole via %qtconsole,
then killing the kernel, at which point the original notebook's connection
(at the zmq level) is never restored to the new kernel at the same endpoint.
It's weird, and probably a zmq bug, but a simple reconnect seems to solve it.
close fds when spawning qtconsole subprocess

avoids lingering connections to zmq sockets across kernel restart
don't restart channels on kernel restart

it wasn't actually necessary (proper fix in previous commit)
publish 'starting' status when kernel starts
add handle_status to qtconsole

So that the qtconsole can notice that a kernel has restarted uncleanly
document status=starting
add missing "starting" status to test_message_spec
Merge pull request #3181 from minrk/ifsince

backport If-Modified-Since fix from tornado

See facebook/tornado#713

closes #3177
Added enhancement to allow for specifying variable name to restore.

Contributes to gh-3167
Added handling of multiple args to store -r and removed error message
Merge pull request #3215 from mshuffett/master

Updates storemagic extension to allow for specifying variable name to load
Merge pull request #2979 from Carreau/cm-configurable

CM configurable Take 2

Change the way configurability works.
Config dict should be passed down to the parent class where it will be
merged with the default value and propagate to this only in the base
class.

This allow to both alter the configuration on a per instance basis, or
globaly by tempering with the class instance.

This also get rid of IPython global in some cases.

-- 

Still not **perfect** but I think this is the limit of my js knowledge, there is a minimal amount of code of 4 line to propagate the configuration :

```
var options = {foo:bar}; // default options can be class parameter
var overwrite_options ={boo:baz}; // came from args, or not
options = this.mergeopt(CodeCell, options, overwrite options);
IPython.Cell.apply(this,[options]);
```
Merge pull request #3174 from Carreau/simple-class

Simple less classes

Simplify class handeling in js/css

Instead of setting several class (e.g: `cell vbox`) per dom element, use less to embed the definition of `vbox` into `cell`.

This should allow : 
   - more easy theming.
   - responsive css on  nbviewer 

There are many other places where this can be done.
informative error when trying to load directories

prior to this commit, the error message for trying to load a directory
looked like this:

    ValueError: '~' was not found in history, as a file, url, nor in the
    user namespace.

now, the error displayed is as follows:

    ValueError: '~' is a directory, not a regular file.