fixed/added some vim mappings