Update Git aliases and extract to gitconfig
Update vimrc, long overdue