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.
typo
fix another doc typo
formatting consistency