ETaC & 3DNPC pt2

These were in response to an ongoing conversation on the ETaC mod page,
but after further discussion it turns out the load order for these
doesn't matter, since the patch resolves all conflicts, regardless of
the order of the two mods.