Clean up of vimrc

Taken from an old .vim fork.