Upstream 4g BETA from Meph:

Changelog:

 - Evil grass now results in temporary madness in grazers.
 - Dwarves can butcher sapients.
 - Removed "mutilated corpse" items from sapient beings.
 - Automatons directly drop clockwork parts upon death.
 - Frost Giants directly drop Bifrost upon death.
 - Kobolds drop bags of loot when being butchered.
 - All sapients leave a "creature soul" when being butchered.
 - All other creatures leave a "soul" when being butchered.
 - Souls will wither away within 1 month, so use them quickly.
 - Biology System now uses souls to research weaknesses, instead of itemcorpses.
 - You can now sacrifice souls to Armok for rewards.
 - Added new workshop: Volcanic Oracle of Armok.
 - Blessings of Armok now hit every dwarf at the same time and last 1 month.
 - The Golem forge no longer needs a "Golem Heart". Its only the research now.
 - Orichalcum is no longer needed for reactions in the temple. Instead souls are being used.
 - Apostles are now sterile. (Oath of Celibacy)
 - Apostles can be upgraded to Priests and High Priests.
 - Priests can detect hidden threats inside the fort.
 - High Priests can detect hidden threats and the cult inside the fort.
 - High Priests can block most cult attacks and give all nearby dwarves NOFEAR.
 - Apostles/Priests can no longer join guilds or military groups.
 - Hidden threats no longer have the hint. (Dwarf paints pentagram, etc)
 - Hidden threats give 1 hint, which is found by a random dwarf.
 - This means you need Priests to find them, and/or Wards of Armok to find and cure them.
 - Fixed some minor bugs.
 - Fixed some typos.
 - Bones. All creatures now leave several bone stacks. This is important to fix the bone stack bug, in which 1 stack equals 1 item. Now you get up to 20 stacks from a butchered creature, so you can use them 20 times.
 - Removed "bone (separate)" item and all reactions, cleaning up a lot of space.
 - Side effect of the bone-fix: Bones have creature names again. Cat bone bolts anyone? Dragon bone armor?
Merge branch '4g_beta' into local_4g_merge

Conflicts in reaction_masterwork.txt involving 'bone stack' -> 'bone'
renames near hotkey fixes done by @SageEthereal.

Where possible, the hotkeys assigned by Sage were preserved.

* 4g_beta:
  Upstream 4g BETA from Meph:

Conflicts:
	Dwarf Fortress/dfhack.history
	Dwarf Fortress/gamelog.txt
	Dwarf Fortress/raw/objects/reaction_masterwork.txt
	Dwarf Fortress/stderr.log
	Dwarf Fortress/stdout.log
Merge branch 'master' into local_4g_merge

* master:
  DFHack: Added probability-syndrome.rb - run commands with probabilities! :)
  Revert "Updated itemsyndrome.lua with 'transformequipon'"
  Updated itemsyndrome.lua with 'transformequipon'
Merge branch 'master' into master_4g_beta

* master:
  maint-bin: Export patches exports probability-syndrome now.
  maint-bin: Yoink master changes -> master_4g_beta
Merge branch 'master' into master_4g_beta

* master:
  maint-bin: Updated sync ordering to be less spammy.
forum-patchlog: Tidy-up included patches. Add -a switch. #dev

Remote tracking merges are no longer shown.
-a shows all commits since upstream.
Merge branch 'master' into master_4g_beta

* master:
  forum-patchlog: Tidy-up included patches. Add -a switch. #dev
Merge branch 'master' into master_4g_beta

* master:
  forum-patchlog: Tidy-up included patches. Add -a switch. #dev
Merge branch 'master' into unified

* master:
  forum-patchlog.pl: Patch messages now display author. #dev
  fix for issue #72
  fix for unchanged values, therapist manual
Merge branch 'master' into unified

* master:
  yoink-master: Read from local .yoinkrc file to find branches
Fixed orc tinkerer to use malachite rather than tetrahedrite

* Tetrahedrite no longer exists.
* Also fixed tinker smelting reactions to show inputs and outputs.
Merge branch 'master' into unified

* master:
  Fixed orc tinkerer to use malachite rather than tetrahedrite
Merge branch 'master' into orc_rebalance

* master:
  Fixed orc tinkerer to use malachite rather than tetrahedrite
Merge branch 'unified' into orc_rebalance

No significant conflicts. Booyah!

* unified:
  forum-patchlog: Tidy-up included patches. Add -a switch. #dev
  Upstream 4g BETA from Meph:

Conflicts:
	Dwarf Fortress/raw/objects/entity_orcfort_taigaorc.txt