Merge branch 'master' into settings

* master:
  Fix 'separate bone' bolt-making reactions. Thanks to GTrax.
  Rebalance: Medicine produces five units from two plants.
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.
Fix many SYN_CLASS tags from forward-slashes to backslashes.
Remove unused and possibly non-operational BLOWGUN_L* inorganics

I'm not sure these would ever work, they have funny names, and
they're not referenced anywhere else.
Update lint-raws to display filenames
yoink-master: iteru branch removed
Merge branch 'master' into settings, RETAINING THE SOURCE!

Because it's silly for us not to have the settings source on our master
branch. Splinterz can't pull properly, people who want to hack
the source need to jump through hoops to find it, etc.

We'll just have an automated build process for end-user downloads.
This means I can include Changelogs in such files, prune out
multiple directories, and generally make it awesome.

* master:
  yoink-master: iteru branch removed
  Update lint-raws to display filenames
  Remove unused and possibly non-operational BLOWGUN_L* inorganics
  Fix many SYN_CLASS tags from forward-slashes to backslashes.
  yoink-master.pl: Remove settings branch from auto-merge.
  Orc merchant fixes
  Merchant shop fixes
  more syndrome name fixes
  fix for biology/speech syndrome names
  fix for white/black altar missing reactions
  lint-raws.pl: Detect undefined and unpermitted reactions.
  yoink-master.pl - Return to current branch. Prettier graphs on github.
  yoink-master.pl - Distribute master patches to all active branches.
Merge pull request #5 from pjf/master

im in ur fork, merging ur branch