From: Andrew Shadura <andrewsh@debian.org>
Subject: Use system-provided six.

--- a/urlobject/netloc.py
+++ b/urlobject/netloc.py
@@ -1,5 +1,5 @@
 from .compat import urlparse
-from .six import text_type, u
+from six import text_type, u
 
 
 class Netloc(text_type):
--- a/urlobject/path.py
+++ b/urlobject/path.py
@@ -4,7 +4,7 @@
 import urllib
 
 from .compat import urlparse
-from .six import text_type, u
+from six import text_type, u
 
 
 class Root(object):
--- a/urlobject/query_string.py
+++ b/urlobject/query_string.py
@@ -3,7 +3,7 @@
 import urllib
 
 from .compat import urlparse
-from .six import text_type, string_types, u
+from six import text_type, string_types, u
 
 
 class QueryString(text_type):
--- a/urlobject/urlobject.py
+++ b/urlobject/urlobject.py
@@ -3,7 +3,7 @@
 from .path import URLPath, path_encode, path_decode
 from .ports import DEFAULT_PORTS
 from .query_string import QueryString
-from .six import text_type, u
+from six import text_type, u
 
 class URLObject(text_type):
 
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # URLObject 2
 
-[![Build Status](https://secure.travis-ci.org/zacharyvoase/urlobject.png?branch=master)](http://travis-ci.org/zacharyvoase/urlobject)
-
 `URLObject` is a utility class for manipulating URLs. The latest incarnation of
 this library builds upon the ideas of its predecessor, but aims for a clearer
 API, focusing on proper method names over operator overrides. It's also being
@@ -50,7 +48,7 @@
 
 ### Credits
 
-This library bundles [six][], which is licensed as follows:
+This library uses [six][], which is licensed as follows:
 
   [six]: http://packages.python.org/six/