Fix argument ordering in pypi.py
Fix a bunch of little issues relating to patching distutils in pypi.py