Rejigging setup.py