Fix recursive import issue in pip/__init__.py
Merge pull request #1239 from pfmoore/recursive_import

Fix recursive import issue in pip/__init__.py
Re-vendor distlib and modify normalized version handling to match
Merge pull request #1243 from pfmoore/distlib-revendor

Re-vendor distlib and modify normalized version handling to match