add rspec, sqlite3, ffaker and factory-girl settings back to dependency
updating gem version
resolve merge conflicts