Cleanup vim settings.  Remove old leftover cruft from my reorg.