Updated setup.py for hopeful inclusion in Pip packages