Merging Brian's work on branch: lp:~ipython-dev/ipython/kernel-config

This makes trunk significantly more usable again.

setup.py

@@ -169,9 +169,9 @@ if 'setuptools' in sys.modules:
         'console_scripts': [
             'ipython = IPython.core.ipapp:launch_new_instance',
             'pycolor = IPython.utils.PyColorize:main',
-            'ipcontroller = IPython.kernel.scripts.ipcontroller:main',
-            'ipengine = IPython.kernel.scripts.ipengine:main',
-            'ipcluster = IPython.kernel.scripts.ipcluster: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

@@ -119,8 +119,8 @@ def find_packages():
     add_package(packages, 'frontend.wx')
     add_package(packages, 'gui')
     add_package(packages, 'gui.wx')
-    add_package(packages, 'kernel', config=True, tests=True, scripts=True)
-    add_package(packages, 'kernel.core', config=True, tests=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)
     add_package(packages, 'quarantine', tests=True)
     add_package(packages, 'scripts')