Re-vendor distlib and modify normalized version handling to match