[to_xp]Gekko
QCT junkie
those are the ones I know of, you could try checking the ingame documentation in the civilopedia to see if there are others
Getting an automatic amphibious promotion for all units WAS a civilization trait for an Emergent leader that I got when I researched Optics.
I did not see anything in the Civilopedia under traits that identified which traits were minor traits.
The Adaptive trait which you can occasionally change your traits seems much better than Emergent if you can at most only acquire 1 or 2 minor traits before settling on a major trait. In order to get Ingenuity, I had to get a Golden Age and I am not sure what the requirements are for Magic Resistance. You do get the occasional "inspired" unit that gets double combat experience, but do you lose that too when you settle on a new major trait?
edit: *raises fist to the sky and screams*: Valkrioooooooooon