Fixed Gemfile.lock
Merge branch 'master' into Brandon
Fixing merge conflicts
Restored original dump file for Redis
Merge pull request #18 from dancingshell/Brandon

Brandon