Major update for vimrc