Update and rename .vimrc

Testing mostly, also changing to match https://github.com/dcreager/dotfiles-base/