Corrections to setup.py (now passes: python setup.py test), updated requirements

...irements