Cleanup the vimrc and add some more functionality.