Some vim stuff
Merged