Reorginize my vim files and clean up ooooold cruft