Move pretty into lib, because it's heavily changed now.

IPython/core/formatters.py

@@ -27,7 +27,7 b' from StringIO import StringIO'
 
 # Our own imports
 from IPython.config.configurable import Configurable
-from IPython.external import pretty
+from IPython.lib import pretty
 from IPython.utils.traitlets import Bool, Dict, Int, Str, CStr
 
 

setupbase.py

@@ -116,7 +116,6 b' def find_packages():'
     add_package(packages, 'external.Itpl')
     add_package(packages, 'external.mglob')
     add_package(packages, 'external.path')
-    add_package(packages, 'external.pretty')
     add_package(packages, 'external.pyparsing')
     add_package(packages, 'external.simplegeneric')
     add_package(packages, 'external.validate')