allow ziminiar to fly in survival
Merge fireworks and fixes from upstream
Merge pull request #4 from mathphreak/master

allow ziminiar to fly in survival