Update .vimrc

Expanded with some more nice-to-have defaults.