added some junk to the spec helper to accomodate redis in our specs
testing validations
commented out a test that i'm working on
Fixed minor merge conflict, removed fixtures and dump file from github