various vimrc fixes