Some vim tweaks from @technicalpickles.