move most git aliases to gitconfig; cleanup vimrc