Lots of little vim tweaks, many courtesy @gf3.