Switch logic so that --use-pypi is giving precendence over pip.