Merge branch 'master' of github.com:keithseahus/dotfiles
Update .gitignore_global and .irbrc.
Solve some conflicts.