More vimrc enhancements