Made a few 'convenience' changes to setup.py