Save irb history
Cleanly resolve rebases
Merge branch 'master' of github.com:rmcastil/dotfiles