Merge branch 'harmonize_raws' into new_unified

* harmonize_raws:
  Automatic harmonization of graphics raws with master files.
Merge branch 'dfhack_r4' into new_unified

* dfhack_r4:
  Add SYN_CLASS:\AUTO_SYNDROME to all SYN_CLASS:\COMMANDs
  Incude and enable all of Falconne's plugins for DFHack r4
  DFHack (R4): Eanble mousequery and zone.
  Enable DFHack search plug-in.
  Added random command to dfhack
  Removed old r3 plug-ins from the DFHack directory. GH #2
  Update itemsyndrome.lua
  Updated DFHack itself to version 0.34.11-r4 and removed any error-causing plugins
  Updated raws for new itemsyndrome
  Update spawn.lua for DFHack 0.34.11-r4
  Updated spawn.lua for DFHack 0.34.11 r4

Conflicts:
	Dwarf Fortress/dfhack.history
	Dwarf Fortress/gamelog.txt
	Dwarf Fortress/raw/objects/inorganic_zmasterwork_2.txt
	Dwarf Fortress/stderr.log
Merge branch 'master' into unified

* master:
  Updated Masterwork Dwarf Fortress.exe from Splinterz
  Move patch-graphics-from-master.pl into maint-bin
Merge branch 'master' into unified

* master:
  Added missing spore-tree saplings to many tilesets.
Merge branch 'master' into unified

* master:
  Update settings program from splinterz/settings
Merge branch 'harmonize_raws' into unified

* harmonize_raws:
  More tileset harmonizations.
  show-tileset-diffs.pl - Less context on unified diffs.
Merge branch 'harmonize_raws' into unified

* harmonize_raws:
  Even more tileset harmonizations.
  show-tileset-diffs.pl - Tweaks and debugging
Merge branch 'harmonize_raws' into unified

* harmonize_raws:
  Manual harmonisation of many tilesets
  show-tileset-diffs: Ignore [BUILD_COLOR] tag
Merge branch 'harmonize_raws' into unified

* harmonize_raws:
  Manual harmonisation of plant raws across tilesets.
  show-tileset-diffs: Ignore DEAD_PICKED_TILE
Merge branch 'dfhack_r4' into unified

* dfhack_r4:
  Update itemsyndrome.lua
Merge branch 'dfhack_r4' into unified

* dfhack_r4:
  Remove now redundant WORKER_ONLY tag from reactions.
Merge branch 'master' into unified

* master:
  patch-graphics-from-master.pl - Ignore already applied patches
  patch-grapics-from-master.pl - Really don't make .rej files
Merge branch 'master' into unified

* master:
  Remove plant_fake.txt from tileset directories.

Conflicts:
	MasterworkDwarfFortress/graphics/Matrix/raw/objects/plant_fake.txt
Merge branch 'harmonize_raws' into unified

* harmonize_raws:
  Ironhand: Remove pumpkins, sugar-cane, and turnips
  Adjust positioning of black-caps in ASCII/plant_standard.txt
Nerfed diseases v6 by thistleknot.

From the release notes at
http://www.bay12forums.com/smf/index.php?topic=133312.msg4804015#msg4804015

* Reduced the % chance of certain diseases considerably...

** Dwarves can now use their disease_resistance against catching the disease
   (i.e. via spreading), also the spreading is nerfed by reducing it's
   chance from 100% spreading to nearby dwarf's to a reduced % (60% for
   influenza, 25% for [visible] plagues).

** Also, resistance is used against specific applications of the diseases (i.e.
   sub syndromes of a disease, ex... necrosis of the liver is resistable).

* If a dwarf suffered from an epidemic (i.e. influenza, meningitis, or
  pnuemonia) they are immune from catching the disease for up to one
  year, does away with the need for mutations.

* Medicine now acts as a vaccine for epidemic's for one year.

* Plague Immunity (v5): Now dwarf's have a resistance chance * 2% of
  being immune to all plagues/rabies

* Medicine now has slightly extended durations against non
  communicable diseases, (i.e. blood pressure)  (needed only 3 times a
  year vs 5.22 times a year for full coverage).
Merge branch 'nerfed_diseases' into unified

* nerfed_diseases:
  Nerfed diseases v6 by thistleknot.
Merge branch 'master' into unified

* master:
  Fix typo syntax error in herbalism research reaction.
  patch-graphics-from-master: Be lenient with whitespace changes.
thistleknot: Increase plague immunity
Merge branch 'nerfed_diseases' into unified

* nerfed_diseases:
  thistleknot: Increase plague immunity
Merge branch 'master' into unified

* master:
  GH #36 - Enable simple minerals by default