Updates to .vimrc

Fixed a lot of config items