fix up some vim commands, organize leader mappings