Use vim
Add colors
Remove unused settings from gitconfig
Set colors for iterm