Fix Linting and Test Failures#2191

chayim merged 3 commits intoredis:masterredis/redis-py:masterfrom

Flipboard:gmelton/build-master-testFlipboard/redis-py:gmelton/build-master-testCopy head branch name to clipboard