Added vim surround and mappings