Beginning to simplify vimrc
More simplifying of the vimrc
a few small changes