Include pip/easy_install/distribute fix as part of upgrade process