Merge branch 'upstream_warlocks' into unified

* upstream_warlocks:
  Import Warlock v0.1 alpha from Meph

Notable conflicts:

    * embark_profiles.txt had conflicts between SWP and warlocks.
      Where conflicts existed, embarks would start with items
      made of leather rather than skin. Warlocks starting with
      skin items is fine; they're creepy.

Conflicts:
	Dwarf Fortress/data/init/embark_profiles.txt
	Dwarf Fortress/hack/scripts/itemsyndrome.lua
	Dwarf Fortress/hack/scripts/spawn.lua
Merge branch 'beta' into alpha

This gives us a single tree with both orcs (beta) and warlocks (alpha)

* beta: (52 commits)
  Disable orcs by default after orc_rebalance merge. #dev
  Remove 1/2 as zoom in/out.
  Fix of Falconne's stocks plugin when melting items.
  Combine all NPC orc reactions into GREENSKIN_ORC for easy management.
  maint-bin: Auto export the manual.
  maint-bin: Added command to export just the manual.
  Fix swapped two-handed and minimum sizes in NPC orc weapons.
  Enabled fix-armory and diggingInvaders plug-ins
  Orcfort: All sentient races now drop scalps.
  Orcfort: Making ironbone and bloodsteel now uses bonecarving labour.
  Orcfort: Orichalcum rebalanced.
  Orc manual: Better text on orc honour by the amazing fasquadron!
  Orcfort: Fix 'corsairs arms' reaction. GH #62
  Move souls to using SOUL_TEMPLATE rather than TORCH_TEMPLATE
  Revert "Materials made from souls are no longer '(creature) soul soul' items."
  Materials made from souls are no longer '(creature) soul soul' items.
  Orcfort: Added missing reactions and removed obsoleted ones.
  Orcfort: Male corsairs now have as good an eye for loot as their female counterparts
  Orcfort: Factories now produce earthenware blocks, not greenware (GH #43)
  Orcfort: Lamellar wargear now includes gloves at the tribal wargear workshop
  ...

Conflicts:
	Dwarf Fortress/raw/objects/reaction_masterwork.txt
Merge branch 'gold' into alpha

* gold:
  maint-bin: Update tools for master -> gold rename
Merge branch 'gold' into alpha

* gold:
  maint-bin: Also sync orc_rebalance. Honestly, this should go in a config file. #dev
Merge branch 'gold' into alpha

* gold:
  Update README.md with branch renaming schema. #dev
Merge branch 'gold' into alpha

* gold:
  Removed obsolete utilities.
  Fix for being unable to copy weaponry blueprints in the scriptorium
  Fix slag being present when turned off in the Settings GUI.
  Settings GUI: Renamed main button to 'Play', and other fixes
  README: Fix mentions of unified -> Beta #dev
Merge branch 'gold' into alpha

* gold:
  Update showunitsyndromes.rb
  maint-bin: Make all options configurable; no more spammy git commits. :)
Merge branch 'beta' into alpha

* beta:
  Orcfort: Ironbone and bloodsteel are now made at the totem pole. #98
Merge branch 'beta' into alpha

* beta:
  Updated Orc Fortress manual from wiki. #dev #manual
  Orcfort: Manual is now autogenerated from the Orc Manual Wiki
  Orcfort: Overhauled manual for new Orc Fortress Rebalanced!
Merge branch 'orc_rebalance' into alpha

* orc_rebalance:
  Orcfort: Updated manual from wiki. #dev #docs
Merge branch 'beta' into alpha

* beta:
  Fixup: Orcs no longer playable but not enabled. #dev
Merge branch 'gold' into alpha

* gold:
  Rebalance: Medicine now makes 3 potions from 1 stack of plants
  Making coke from wood no longer creates ash.
  Updated readme with new contributor's guide #dev
Merge branch 'upstream_warlocks' into alpha

* upstream_warlocks:
  Import Warlock v0.2 alpha from Meph

Trivial conflicts to resolve (orcs and warlocks wanted
to add indepedent reaction classes, and both should
be included)

Conflicts:
	Dwarf Fortress/raw/objects/inorganic_stone_mineral.txt
Merge branch 'gold' into alpha

* gold:
  exported options #102 and diggingInvaders #106
  allow ammo metals
  Clean-up of boneyard reactions and typo fixes
Merge branch 'beta' into alpha

* beta:
  Orcfort: Added many missing reactions for ore-processor products to smelter.
  Orcfort: The Orcish molten pit now doubles as a slag pit.
  Orcs now have comprable boneyard products to dwarves.
Merge branch 'beta' into alpha

* beta:
  Fixup: Removed SMELT_metal reactions from last commit.
Merge branch 'beta' into alpha

* beta:
  Corrected various misspellings in reactions.
  Fixed Issue #49 - Purple block reaction was missing from entity_default
  Fixup: Plural of larva really is larvae. ;)  #dev
  Fixed missing child names. (GH #22)
  Add missing boneforge screenshot. #fixup
  Updated orc manual (Wiki version: 0f9d452)
  Orcfort: Add Boneforge smelter
  Orcfort: Added missing reactins to kitchen.
Merge branch 'beta' into alpha

* beta:
  Separation and improvement of digging and razing invaders #106
  removed duplicate color
  Added brackets for zoom
Merge branch 'beta' into alpha

* beta:
  maint-bin: forum-patchlog can produce output in markdown
  maint-bin: Added code to update top-posts from markdown pages. :)
Merge branch 'upstream_warlocks' into alpha

aka "Meph's in ur raws, changing ur capitalisation".  ;)

* upstream_warlocks:
  Import Warlock v0.3 alpha from Meph

Conflicts:
	Dwarf Fortress/hack/scripts/spawn.lua
	Dwarf Fortress/raw/objects/reaction_orcfort.txt
	MasterworkDwarfFortress/repository/buildings.html