Reorganize vimrc, remove cruft.