2 fixes for setuptools upgrades: 1) works using setuptools wheels, 2) works when a distribute-0.7.X wrapper is installed
setuptools upgrade tests
confirm wheel was used in setuptools/wheel upgrade test
Merge pull request #1092 from qwcode/upgrade_setuptools_wheel

setuptools upgrade fixes (and upgrade tests)