Use vimdff as git difftool
Document tab width settings in vimrc
Add vim plugins
Add heroku to zshrc
Move old arch config into branch