Merge branch 'master' of github.com:kennethreitz/requests

Conflicts:
	requests/compat.py
	setup.py

requests/compat.py

@@ -81,12 +81,6 @@ except ImportError:
 # Specifics
 # ---------
 
-try:
-    import cchardet as chardet
-except ImportError:
-    from .packages import chardet
-
-
 if is_py2:
     from urllib import quote, unquote, quote_plus, unquote_plus, urlencode
     from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag

setup.py

@@ -17,7 +17,7 @@ if sys.argv[-1] == 'publish':
 packages = [
     'requests',
     'requests.packages',
-    'requests.packages.charade'
+	'requests.packages.charade',
     'requests.packages.urllib3',
     'requests.packages.urllib3.packages',
     'requests.packages.urllib3.packages.ssl_match_hostname'