Corrections to setup.py (now passes: python setup.py test), updated requirements
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from chadlung/master

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