Much cleanup of vimrc