Just to add to the confusion...some wide-angle lenses that can focus very closely, such as the TS-E 24 II and the 8-15 fisheye, can make for much more interesting "macro" lenses than a true, dedicated macro lens. They let you get super-close to your subject for an interesting perspective and generally do a great job at including enough of the surroundings to put it in context.
Further, with the TS-E 24, you can tilt the plane of focus so you get that small wildflower, the cactus in the midground, and the mountains in the background all in sharp focus.
But, to me, an actual macro lens is a fixed focal length lens that at least does 1:1 reproduction, though I'll give a pass to the 50 Compact Macro that can take that addition to reach 1:1. Anything else is marketing bullshit. And a real macro lens starts at 1:1, and typically has a focal length of 65 mm....