Viacom and CBS announce new merger—here's a recap on everything leading up to it