minor vimrc changes
merge conflicts resolved