Merge pull request #19 from splintermind/master

inclusion of new masterwork settings source
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.
Merge remote-tracking branch 'splinterz/master' into settings

* splinterz/master:
  fix for backwards 'simple' settings
  fixed random creature issue
  tileset color mapping, modified background, about button
Updated Masterwork Dwarf Fortress.exe from Splinterz

The executable is 9a26638200cd7dc6a5f3ed1b854b5cd50c496be5
Merge branch 'master' into settings

This harmonizes splinterz' git branch with our master.
Upstream was released with different default settings to
splinterz/settings, so there are *lots* of raw changes
which are flipping features on and off.

With conflicts, we took upstream's Masterwork.settings file,
and removed creature_random_rc.txt, entity_random_rc.txt,
and langauge_RANDOM.txt (they were removed in splinterz/settings).
preview.png was also removed, as it is no longer upstream (and
presumably no longer used).

* master:
  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

Conflicts:
	Dwarf Fortress/Masterwork.settings
	Dwarf Fortress/raw/objects/creature_random_rc.txt
	Dwarf Fortress/raw/objects/entity_random_rc.txt
	Dwarf Fortress/raw/objects/language_RANDOM.txt
	Settings Source/Resources/preview.png
merge with pjf settings raws