allergies passing.
fix merge tests.
fix counts.
Add redis to travis.
Merge pull request #149 from amida-tech/matt-attack

Bug fixes and test cleanup.