Vim tweaks (and removed some old, unused mappings)