more git aliases, some vimrc updates (using macvim for now)