Clean up Makefile and use __main__ module
Add extra classifiers to setup.py