Clean up
Drop setup.py from MANIFEST
Migrate to dict for setup args