Merge branch 'master' into settings

* master:
  Fix 'separate bone' bolt-making reactions. Thanks to GTrax.
  Rebalance: Medicine produces five units from two plants.
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.
GH #56 : Remove no longer useful research lab from orcs.

See http://www.bay12forums.com/smf/index.php?topic=113621.msg4847742#msg4847742
for discussion on this.
Merge branch 'master' into nerfed_diseases

* master:
  GH #56 : Remove no longer useful research lab from orcs.
  yoink-master: iteru branch removed
  Update lint-raws to display filenames