Updating .vimrc with latest from Steven