Fix, sphinx template not removing new lines from headers
Merge pull request #4181 from jdfreder/crlf

nbconvert: sphinx template not removing new lines from headers
fix skeleton template makefile
run skeleton template makefile
Merge pull request #4168 from takluyver/py3-failing-tests

Fixes the failing tests revealed by #4165.
ESC should be handled by CM if tooltip is not on
Have remove_and_cancel_tooltip() return a boolean
Merge pull request #4178 from minrk/data_javascript

add missing data_javascript
Merge pull request #4174 from minrk/markup-templates

various issues in markdown and rst templates

- remove prompts from default output
- add missing HTML block
- remove double-wrapping of latex
- use plain-markdown indentation for code blocks (could use GFM ``` ` ` `python```)
- images didn't work in either one at all
- markdown extracts output

closes #4024
converted multi-context with-statements to nested (2.6 compatibility)
moved DummyMod to proper namespace to enable pickling
Revert "converted multi-context with-statements to nested (2.6 compatibility)"

This reverts commit 311acdf45e9d164ac3dd3eb72b913dfc7d7e4314.
always fire LOCAL_IPS.extend(PUBLIC_IPS)

was in `else`, but should have been `finally` so it aways runs.


Symptom was warnings in parallel.client about `127.0.1.1` not being this machine.
update version-check message in setup.py and IPython.__init__

clearer message that IPython no longer supports 2.6.
update Python version classifiers:

- drop specific 3.x
- drop 2.6
update README with dropped 2.6 and 3.2 support

also clarify the checkout steps in development install
Use Instance trait for user_ns instead of Dict.

Instance(dict) is None by default, unlike Dict().
Add a test for kernel started without user_ns kwarg.

user_module should not be an instance of DummyMod
Merge pull request #4189 from minrk/localinterfaces-finally

always fire LOCAL_IPS.extend(PUBLIC_IPS)
Merge pull request #4188 from takluyver/dict-traitlet-none

Allow user_ns trait to be None

The Dict trait converts None to an empty dict, which caused the application to pass in a user_ns to the shell, which then behaves slightly differently, creating a DummyMod instance.