Remove unproduceable 'mail' armor from raws.

Mail shirts and other mail items are still available, as these both
have reactions and are used by invaders. Only ITEM_ARMOR_MAIL was
removed, as it could only be obtained from a mood (although could
then be copied by the inventor).

See http://www.bay12forums.com/smf/index.php?topic=125628.msg4774188#msg4774188
Remove confusing ITEM_ARMOR_LAMELLAR. Lamellar leather armor remains.

Almost every reaction in the game that produces 'lamellar armor'
creates '[lamellar leather] armor', which is 'armor' crafted from
'lamellar leather'. However the boneyard, and some very rare
religious/expedition reactions could create 'lamellar armor',
which was an entirely different thing.

This change keeps the lamellar leather armour pieces that everybody
uses, and removes the confusing and almost entirely unused 'lamellar
armor'.

This also explains why I could never get my military to have uniforms
of lamellar leather armor; I was instructing them to wear 'lamellar armor'
rather than 'armor' of material 'lamellar leather'. :)
Exported patch files no longer contain branch merge messages.

There were a lot of these, and end users don't care.
Upstream release - 4e
Merge branch 'upstream'

All conflicts were trivially resolved.

Eyeballing all changes doesn't show any obvious regressions.

Conflicts:
	MasterworkDwarfFortress/graphics/patch-graphics-from-master.pl
Spacefox: Cave fungus is no longer invisble.
Move patch-graphics-from-master.pl into maint-bin

This means all our maint utils are in one place.

This commit also updates the code to work in a more location
independent fashion.
Updated Masterwork Dwarf Fortress.exe from Splinterz

The executable is 9a26638200cd7dc6a5f3ed1b854b5cd50c496be5
Added missing spore-tree saplings to many tilesets.

All tilesets except Masterwork, Obsidian Soul, and Phoebus were
missing spore tree definitions. This is now fixed.
Update settings program from splinterz/settings

Most notably changes from:
https://github.com/pjf/masterwork-dwarf-fortress/commit/f005f3f4ad97d5c5fc4d3838a348a7a16964abf8
Merge branch 'master' into harmonize_raws

* master:
  Update settings program from splinterz/settings
  Added missing spore-tree saplings to many tilesets.
  Updated Masterwork Dwarf Fortress.exe from Splinterz
  Move patch-graphics-from-master.pl into maint-bin
  Spacefox: Cave fungus is no longer invisble.
  Upstream release - 4e
  Exported patch files no longer contain branch merge messages.
  Remove confusing ITEM_ARMOR_LAMELLAR. Lamellar leather armor remains.
  Remove unproduceable 'mail' armor from raws.