Update setup.py to match requirements elsewhere
Merge pull request #124 from robhudson/setup-req

Update setup.py to match requirements elsewhere