Add vim-surround
Add alias to prefer brew-provided version of git