More vim tinkering