Lots of vimrc fixes