Improvements to vimrc