Which dinosaur, famously involved in a long-standing scientific naming dispute with Apatosaurus, was officially reinstated as its own valid genus in 2015?