More vim changes
More vim changes