Include test-requirements in package (fixed #47).
Merging master into v1.3
Merge branch 'master' into release
Merge branch master into release
Version bump.
Ugh merge fail.
Merge branch 'master' of https://github.com/shazow/urllib3 into release
Merge branch master into release, with version bump.
add ssl_version unittest that works everywhere

This should fix discrepancies between OpenSSL < 1.0 and > 1.0 and also
work on Ubuntu where ssl.PROTOCOL_SSLv2 has been removed
remove superfluous request parameters
remove make_headers from pool.rst

It is already in helpers.rst wasn't built anyway.
Generate 'Host' header with proxies.
Don't spuriously set the 'Host' header.

Also some docstring changes.
explicitly flush all gzip data

On pypy data is buffered to long due to different garbage collection
strategies [0]. By explicitly closing the dummy files those buffers are
flushed and data is not truncated.

[0] (http://doc.pypy.org/en/latest/cpython_differences.html#differences-related-to-garbage-collection-strategies
explicitly close listening and connected sockets
Merge pull request #147 from t-8ch/fix_pypy_tests

Fix pypy tests.
Merge pull request #142 from t-8ch/fix_ssl_test_on_old_openssl-2

Fix ssl test on old openssl.
Merge pull request #146 from Lukasa/host_header

Generate 'Host' header with proxies.
Style.
Fixed proxy test (#146).