Updated aliases and vimrc