Some more vim tweaks