Merge pull request #81 from splintermind/master

fix for priest and candelabra interactions
Tweak forum-patchlog to show since 4g merge

Also make exclude regexps better
Orcfort: All orcs now show their castes on embark
Orcish tribal embark actually includes wolves, and no longer blows point balance.

Changed WOLF to DIRE_WOLF_ORC, as they're always available to orcs (common domestic)
Merge pull request #83 from splintermind/master

fixes for itemsyndrome and spawn scripts
Merge pull request #84 from splintermind/master

minor setting changes, fix save updates
reverted allowing saves to be updated

- updating saved games is pretty broken, best not to even allow it for
now
SWP fix: Correct dodgy tags on playable civs

Thanks to Gamerlord for reporting this.
export-patches: Ignore more #dev only dotfiles
forum-patchlog: Cleverly figure out last merge commit! #dev

Many thanks to the amazing @ilmari for incredible git-fu that
allowed this to happen.

Also updates patchlog.exclude
Fixup: #dev Fix trivial whitespace.

This stops tools thinking files have changes against upstream.
maint-bin: More aggressively filter files from patches. #dev
Orcfort: Grinding mithril/cobalt/wolfram only requires 4 bars now.

It used to require six, making it 50% more expensive than grinding boulders.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	maint-bin/forum-patchlog.pl