Cleaned up setup.py so that it runs without warnings