Merge branch 'master' into settings

* master:
  Set previously missing YESTREE on BLACK_CAPs in ASCII tileset
  Add missing braces around INVERTED TILE in masterwork tilesets and Obsidian Soul
  Normalise tilesets with formatting of harder invaders.
  Fix missing brackets on INVERTED_TILE tags
Merge pull request #3 from pjf/settings

Merge from SWP / settings
Merge pull request #4 from pjf/master

Updates to master : Medicine rebalance, separate bone bugfixes
fix for white/black altar missing reactions

- adds missing reactions (vampire, de-vampire, werewolf) to the white
and black altar for dwarves
- renamed lycantrophy to lycanthropy where applicable
- werewolf reaction untested, just assuming it was left out of the
entity file like vampires
fix for biology/speech syndrome names

- changed syndrome names for biology research to indicate their level
- changed syndrome names for speeches to indicate their effects
- removed duplicate tags from speech reactions
more syndrome name fixes

- updated music syndrome names to indicate what effect(s) they apply
Merge remote-tracking branch 'splinterz/master'

* splinterz/master:
  more syndrome name fixes
  fix for biology/speech syndrome names
  fix for white/black altar missing reactions

* Includes work on GH #33
* Fixes GH #25
Merchant shop fixes

Changed reactions to produce stacks of 500 coins.
Fixed the Blackpowder/dynomite reactions
Corrected the "Sell megabeast soul for 5000 sovereigns" to say 10000
since that his how many it produces and seems to be appropriate.
Orc merchant fixes

Oops forgot to fix the coin stacks on them
Merge pull request #52 from BillyJackDF/master

Merchant shop fixes courtesy of BillyJack

References GH #35.
yoink-master.pl: Remove settings branch from auto-merge.

The auto-merge can try to delete the source code in settings, which
is not ideal.
Merge branch 'master' of https://github.com/pjf/masterwork-dwarf-fortress into iteru