with tox/travis, tests don't need to know about the environment
Merge branch 'master' of github.com:andymccurdy/redis-py