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