use --no-use-wheel in the bundle functional tests
Upgrade pkg_resources to setuptools 2.1
Merge pull request #1490 from dstufft/upgrade-pkg_resources

Upgrade pkg_resources to setuptools 2.1
Properly parse comments from the end of a line
Merge pull request #1496 from dstufft/strip-extra-whitespace-reqs

Properly parse comments from the end of a line
Upgrade requests to 2.2.1

Thanks @kennethreitz, @Lukasa, @sigmavirus24, and @shazow for
a quick turnaround!
Merge pull request #1499 from dstufft/upgrade-requests

Upgrade requests to 2.2.1
`pip wheel` warning when wheels are already available on pypi
`pip wheel` warning when wheels are already available on pypi
Update changelog
Set the date for the 1.5.2 release
Bump version
Merge branch '1.5.X'
Merge branch 'master' into develop

Conflicts:
	pip/__init__.py
	pip/req.py
Regenerate the get-pip.py installer
Merge branch 'master' into develop
Remove uses of sys.exc_info()[1]

Using sys.exc_info()[1] is a hack that was used to use a shared
source approach to Python 3.x support that also included versions
of Python that didn't include the except ... as exc: construction.
Pip no longer supports any of these versions of Python so we can
remove it.
Merge pull request #1508 from dstufft/remove-exception-cruft

Remove uses of sys.exc_info()[1]
Setup ignores for flake8
Fix the style of the code base to better match pep8