Fix Gemfile.lock merge conflict
Remove secret cookie store after the upgrade to rails 4.0.0.rc1
Get test suite to pass - Fix test db issues