More fixes to vimrc