Update vim stuff
Fix merge conflicts