Improved vimrc slightly