setuptools upgrade fixes

2 fixes for setuptools upgrades (with better comments on the upgrade "hacks" we have)

1. works using setuptools wheels when upgrading from >0.7 (#1091)
2. works when a distribute-0.7.X wrapper is already installed from a previous upgrade

will also be adding upgrade tests to this branch later...