Remove .DS_Store files, add to .gitignore
Update Gemfile.lock for Windows