Updated formatting of timestamps to match
Merge branch 'master' of github.com:joeledwards/redis-py