It doesn't need the files from Zanzetkuken. The other files that he gave were related with human and elf (sawmill, wood altar for elf, etc). Just put it in the raw (in place of your current, but make a back up first).
There is one problem. The world could wind up completely different, and the goal was to have everyone using the same world.
Also, I think I know what the problem with the trolls is.
Well, I've only changed the entity you made. But you know that only dwarves and goblins were playable in it ? Humans and elves didn't have the Civ playable (and maybe not other stuff). About the other files, they just modify things into the elf and human civ (buildings + reaction), and new plants (altough I didn't see any).
If we want the same world, I don't see how it matters. The only things that matter before generating is plants/weapons available, else, the civ won't have it at embark. So only the entity is needed. And we need to have at least one of each civ to play on the same world.
Also, I don't really see the point with goblins not digging under the 2nd cavern layer. Preventing magma, nether cap and strand ?
The trolls come from Evil_animals. We could add other animals, or probably change the cost, but anyway, I don't think trolls fit in with hermit, and other animals doesn't fit goblins.
The entity I posted is the one Zanzetkuken posted modified to enable goblins (so just removed dwarven : Civ playable, and else, made changes in goblin civ).