add aliases for vi/vim to force it to use bash as it's inner shell
Merge branch 'master' of https://github.com/jldailey/dotfiles
Merge branch 'master' of https://github.com/jldailey/dotfiles