More vim goodness