A bunch of minor setup.py changes