Amazon steps up competition with Netflix, Viacom and DirecTV make peace, and Twitter continues legal fight.
