Merge pull request #2 from pjf/settings

Updated commits from upstream/master
raw changes for new options

not quite finished (still needs materials) but most changes are there
for the new civ options. requires quite a few raw changes to both the
original and graphics packs, so it could use some testing.

- updated entity files to include either !BABYSNATCHER! or
[BABYSNATCHER] tokens
- updated main civ. creatures to include NATURAL_SKILLS tokens, and/or
the related YESHARDERINVADER_<CIV_NAME> tags so the settings app can
find them
- added missing siege and trade triggers where applicable
- fixed elf and evil elf siege triggers (less of an issue now that they
can be changed via the interface)
- fixed missing settings tags in fortdefense files (very minor issue)
- removed duplicate ASCII color scheme, and update ASCII color map to
use default colors (VANILLA)
- fixed some of the flickering issues when changing tabs