fix #1029 (urlparse.urlparse() instead of just urlparse())
Merge branch 'develop' of github.com:/pypa/pip into develop
fix version
Merge pull request #1032 from dholth/release-1.4

urlparse.urlparse() fix
'pip list' should list pip and setuptools
setuptools requirement is now >=0.8
new install instructions after release of setuptools-0.8/distribute-0.7.3
1.4rc3
update changelog with note about case where distribute upgrade can fail
merge from release-1.4 branch