Sneaky pete fixes
Merge pull request #52 from cweidenkeller/redis_agent_bugs

Sneaky pete fixes