Merge branch 'proxyscheme' of git://github.com/Lukasa/requests into 2.0

diff --cc requests/utils.py
index e592c8bb26bb67a5f45ebd7f6297f447de0d8d2e,618a5a19bdfafac020f75e06d55141fba1a7a5ab..347f2be116d09e03311783928f25b02fd2cfa452
--- 1/requests/utils.py
--- 2/requests/utils.py
+++ b/requests/utils.py
@@@ -21,10 -21,11 +21,11 @@@ from netrc import netrc, NetrcParseErro
  from . import __version__
  from . import certs
  from .compat import parse_http_list as _parse_list_header
 -from .compat import quote, urlparse, bytes, str, OrderedDict, urlunparse
 -from .compat import getproxies, proxy_bypass
 +from .compat import (quote, urlparse, bytes, str, OrderedDict, urlunparse,
 +                     is_py2, is_py3, builtin_str, getproxies, proxy_bypass)
  from .cookies import RequestsCookieJar, cookiejar_from_dict
  from .structures import CaseInsensitiveDict
+ from .exceptions import MissingSchema
  
  _hush_pyflakes = (RequestsCookieJar,)