Tech Debt: Update a few vim mappings