More Vim tweaks