Improved vimrc