McD, Starbucks add heat to long-brewing coffee wars