Import Warlock v0.2 alpha from Meph
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