make redis branch
Merge branch 'master' into redis

Conflicts:
	tweets.py
add to readme
Merge branch 'redis'
add redis server, but with fallback to the in-memory implementation