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.
Merge branch 'master' into release.

Preparing for v1.6.
Version bump: 1.5 -> 1.6
Merge branch 'master' into release.

2012 -> 2013.
CHANGES.
CHANGES.
Merge branch 'master' into release
CHANGES again. Messiest release merging ever.
Merge branch 'master' into release

Conflicts:
	CHANGES.rst
Version bump.
Add rudimentary Timeout class

This is just to get the tests passing, it doesn't change behavior

You can now specify Timeout values with urlopen(timeout=util.Timeout(request=20))
in addition to the usual float/int ways of specifying it.

Also add a test case for the old way of specifying a timeout
revert unnecessary change
Add an EnhancedHTTPConnection class

We need to override the default connect() method so we can set our own connect
timeout. Also adds two new error classes, ConnectTimeoutError and
RequestTimeoutError

Adds a bunch of tests that total, request and connect timeouts do what they are
expected to do.