updated some git aliases and changes to vimrc