Merge branch 'master' of github.com:jmizgajski/hot-redis into feature/collections_using_Redis_SortedSet

Conflicts:
	hot_redis/types.py