More vim tweaks