Still learning how git works.

Reverting my setup.py fixes because they were already fixed upstream.
Merge branch 'master' of https://github.com/rguarino/ReviewBot