edit .gitignore and add back Gemfile.lock