Merge branch 'marbre-jupyter'

Merge branch 'marbre-jupyter'

* marbre-jupyter: (26 commits)
  dev-python/testpath: Add missing indent
  dev-python/testpath: Move KEYWORDS variable
  dev-python/notebook: Move KEYWORDS variable
  dev-python/nbconvert: Move KEYWORDS variable
  dev-python/nbformat: Move KEYWORDS variable
  dev-python/jupyter_core: Move KEYWORDS variable; Remove pytest-cov from deps
  dev-python/jupyter_console: Move KEYWORDS variable
  dev-python/jupyter_client: Move KEYWORDS variable
  dev-python/ipython: Add missing dies, reduce indent
  dev-python/ipython: Version bump; Fix deps
  dev-python/ipython: Version bump; Import from science overlay
  dev-python/testpath: Import from science overlay
  dev-python/jupyter: Import from science overlay
  dev-python/notebook: Import from science overlay
  dev-python/pickleshare: Import from science overlay
  dev-python/jupyter_console: Import from science overlay
  dev-python/nbconvert: Import from science overlay
  dev-python/qtconsole: Import from science overlay
  dev-python/ipyparallel: Import from science overlay
  dev-python/jupyter_client: Import from science overlay
  ...