Varius vim tweaks