Fixing minor import error.
Fix IPython.utils.path when HOME=/.
Fix subrepos.
Pop out any existing IPYTHONDIR or IPYTHON_DIR variables.
Moving web services into a subdir.
Fixing imports for frontend tests.
Updating imports.
Updating more imports.
Merge pull request #3320 from minrk/configfile

define `__file__` in config files
Merge pull request #3321 from ellisonbg/nbreorg

Reorganize the python/server side of the notebook
Failing test for gh-3334
Use new input transformation API in %%time

This avoids the perils of 'multiline specials', where valid Python syntax
unexpectedly gets turned into IPython magic commands.

Closes gh-3334
Comment & Refactor, utils and nbconvert main.
Cleanup and refactor, transformers
Moved write and stdout options to main app
Cleanup and refactor of filters
Cleanup and refactor of API, almost complete.
Still need to target exporter.py and convert.py
Then one last run-trough.
Allow filename with extension in find_cmd in Windows.

closes gh-3316 (hopefully)
Merge pull request #3323 from takluyver/strip-prompts

Strip prompts even if the prompt isn't present on the first line.

Users (including me) often copy and paste examples from just after the first prompt. This checks for prompts in the first two lines of a block, but if they aren't found there, it will ignore prompt-like prefixes in later lines, to minimise interference with multi-line strings etc.

This fixes both incoming copies (transformed before running code) and outgoing (copied from the Qt console).

Closes #3206
Merge pull request #3333 from t-8ch/patch-1

notebookapp: add missing whitespace to warnings