ENH Finished a round of vim changes