Vimrc improvments