Updated vimrc and aliases