Major overhaul and cleanup of my vimrc.
More cleanup.