tweaks to vimrc
Moving toward unified branch