More vim tweaking