Merged: https://github.com/CleverRaven/Cataclysm-DDA/pull/2496

Prevent random selection of conflicting traits.