UPDATE 2-CBS, Dish reach deal after CBS pulls programming

(Adds more details about the deal, previous dateline Washington)