removes redis, completes mongo integration
fixes merge conflict
Merge pull request #61 from scottjason/fix-conflict

completes mongo integration