Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend

Conflicts:
	IPython/zmq/pykernel.py

IPython/testing/iptest.py

@@ -153,10 +153,6 @@ def make_exclude():
     ipjoin = lambda *paths: pjoin('IPython', *paths)
     
     exclusions = [ipjoin('external'),
-                  # Deprecated old Shell and iplib modules, skip to avoid
-                  # warnings
-                  ipjoin('Shell'),
-                  ipjoin('iplib'),
                   pjoin('IPython_doctest_plugin'),
                   ipjoin('quarantine'),
                   ipjoin('deathrow'),

setup.py

@@ -207,12 +207,11 @@ if 'setuptools' in sys.modules:
     setuptools_extra_args['zip_safe'] = False
     setuptools_extra_args['entry_points'] = {
         'console_scripts': [
-            'ipython = IPython.core.ipapp:launch_new_instance',
+            'ipython = IPython.frontend.terminal.ipapp:launch_new_instance',
             'pycolor = IPython.utils.PyColorize:main',
             'ipcontroller = IPython.kernel.ipcontrollerapp:launch_new_instance',
             'ipengine = IPython.kernel.ipengineapp:launch_new_instance',
             'ipcluster = IPython.kernel.ipclusterapp:launch_new_instance',
-            'ipythonx = IPython.frontend.wx.ipythonx:main',
             'iptest = IPython.testing.iptest:main',
             'irunner = IPython.lib.irunner:main'
         ]

setupbase.py

@@ -111,6 +111,7 @@ def find_packages():
     add_package(packages, 'frontend')
     add_package(packages, 'frontend.qt')
     add_package(packages, 'frontend.qt.console')
+    add_package(packages, 'frontend.terminal', config=False, tests=True, scripts=True)    
     add_package(packages, 'kernel', config=False, tests=True, scripts=True)
     add_package(packages, 'kernel.core', config=False, tests=True)
     add_package(packages, 'lib', tests=True)
@@ -254,12 +255,11 @@ def find_scripts():
     """
     kernel_scripts = pjoin('IPython','kernel','scripts')
     main_scripts = pjoin('IPython','scripts')
+    frontend_terminal_scripts = pjoin('IPython','frontend','terminal','scripts')
     scripts = [pjoin(kernel_scripts, 'ipengine'),
                pjoin(kernel_scripts, 'ipcontroller'),
                pjoin(kernel_scripts, 'ipcluster'),
-               pjoin(main_scripts, 'ipython'),
-               pjoin(main_scripts, 'ipythonx'),
-               pjoin(main_scripts, 'ipython-wx'),
+               pjoin(frontend_terminal_scripts, 'ipython'),
                pjoin(main_scripts, 'pycolor'),
                pjoin(main_scripts, 'irunner'),
                pjoin(main_scripts, 'iptest')