Support --python-pypi when using --python-pip
Merge pull request #652 from dlindquist/support-pypi-in-pip

Support --python-pypi when using --python-pip