Allow _prepare_conn() to run on Python 2.6.4

When running on Python 2.6.4, a TypeError is thrown in _prepare_conn() 
because httplib's _set_tunnel only takes two parameters.  This change 
will let the code run on Python 2.6.4 if proxy_headers are not set.
Allow _prepare_conn() to run on Python 2.6.4

Taking advice from https://github.com/shazow/urllib3/pull/411#issuecomment-46397017 and subsequent comments to clean up the code a little and pacify coverage tests.
Update connectionpool.py
Merge pull request #411 from arkpog/patch-1

Allow _prepare_conn() to run on Python 2.6.4
CHANGES for #411
Version bump.
Shuffling around requirements file, adding Makefile.
Make-ify travisci.
Fiddling more with travisci.
Adding release process (WIP).
Release bash file?
release.sh
Release target.
Looking good.
Simplify Makefile and update README.rst
README formatting/phrasing.
More readme tweaking.
Test notes.
Update docs requirements and remove it from dev requirements to speed up travisci.
CHANGES for #416