Major update to vimrc