Add redis-server command to instructions
Add unfortunate hack to handle touch events
Fix merge conflicts