Merge tool = vimdiff
Merge branch 'master' of github.com:CrimsonTautology/dotfiles
Add vundle shortcut