Cleaned up setup.py and added missing deps