Charlie Ergen reunites Dish, EchoStar in all-stock deal