Reorganize the vim settings