Fun infographic (click to enlarge).  I think it oversimplifies both movements, and adds to the notion that they are competing movements (in my view, the two movements overlap in many important respects), but it's still interesting: