Clean up setup.py
Merge pull request #681 from ddysher/clean-setup-file

Clean up setup.py