cleanup
Merge branch 'master' into feature/rankers

Conflicts:
	hot_redis/tests.py
	hot_redis/types.py
Merge branch 'master' into feature/rankers

Conflicts:
	hot_redis/tests.py
	hot_redis/types.py