Improvements to .vimrc