Updated .gitignore with runtime files. #dev
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
Updated itemsyndrome.lua with 'transformequipon'

From:

https://gist.github.com/Putnam3145/7005730/aa634d042cb8223d3c17bc6791b21dcf95627891
fix for unchanged values, therapist manual

- fixes the issue where tabbing through the numeric text boxes, without
changing anything results in a notification that the save failed because
no new value was passed in.
- updated therapist manual to latest version
Revert "Updated itemsyndrome.lua with 'transformequipon'"

This reverts commit 6354218d3333db60cb9af4f0c9a08cb3afddcf8c.

Apparently it doesn't compile. We don't want that!  o_O
DFHack: Added probability-syndrome.rb - run commands with probabilities! :)

In a nutshell, this allows for probability tables to be added as
reaction products

For example the following would effectively roll 1d5,
and initiate an ambush by elves, humans, drow, dwarves,
or have no effect, based upon the result:

    [PRODUCT:100:1:BOULDER:NONE:INORGANIC:PROBABILITY_TABLE]
        [PRODUCT:20:1:BOULDER:NONE:INORGANIC:SIEGE_ELF]
        [PRODUCT:20:1:BOULDER:NONE:INORGANIC:SIEGE_HUMAN]
        [PRODUCT:20:1:BOULDER:NONE:INORGANIC:SIEGE_DROW]
        [PRODUCT:20:1:BOULDER:NONE:INORGANIC:SIEGE_DWARF]

See hack/scripts/probability-syndrome.rb for full details.

(This forms a squished commit of the side-branch `probability-syndrome`,
ending at d823b75d48ea8ce9a4e500c9b039b0c2f8313b9c)
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'
maint-bin: Yoink master changes -> master_4g_beta
maint-bin: Export patches exports probability-syndrome now.
Merge branch 'master' into master_4g_beta

* master:
  maint-bin: Export patches exports probability-syndrome now.
  maint-bin: Yoink master changes -> master_4g_beta
maint-bin: Updated sync ordering to be less spammy.
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
forum-patchlog: Tidy-up included patches. Add -a switch. #dev

* Remote tracking merges are no longer shown.
* -a shows all commits since upstream.
* export-patches.pl now uses forum-patchlog to generate patchlog files
Merge branch 'master' into master_4g_beta

* master:
  forum-patchlog: Tidy-up included patches. Add -a switch. #dev
fix for issue #72

fixes mismatch between diseases for graphics packs and primary file
Merge remote-tracking branch 'splinterz/master'

* splinterz/master:
  fix for issue #72
  fix for unchanged values, therapist manual
forum-patchlog.pl: Patch messages now display author. #dev