Merge pull request #860 from Erthilo/Bleeding-Edge

Fixes diona nymphs being able to evolve, other tweaks.
Tons more vox clothes.