Sync setup.py to pip-requires
Merge remote-tracking branch 'upstream/master'
Merge pull request #236 from chadlung/master

Sync setup.py to pip-requires