Add back Gemfile.lock and update some gems