Improved .vimrc