Some more vimrc enhancements