After Vanquishing Ebook Rivals, Amazon Now Makes Peace With Publishers