Fix-up setup.py

- Closes #30