More vim stuff
Merge