Added and cleaned up requirements in setup.py