Add function for merge conflicts
no more bundle exec
Reinstall nokogiri
Fix gca to update the date
Merge branch 'master' of github.com:danrabinowitz/dotfiles