adds Command mappings and cleans up macvim only mappings