Updates .gitconfig

Makes several changes to .gitconfig, most notably using vimdiff by
default.