Merge branch 'develop' into feature/byte_strings_everywhere

* develop:
  Fix the TTL -1/-2/None confusion - it varies by strictness.
  Fix scan: the cursor is returned as a long in redis-py.

Conflicts:
	mockredis/client.py
	mockredis/tests/test_redis.py