Changed/added Make vim mappings