Drowfort  - 4f update

This merge brings drow fortress up to date with Masterwork 4f.

To simplify my constellation of branches, I'm looking at retiring my drow fortress branch. Keeping it around is likely to result in lots of merge history clutter. Please do feel free to merge from my master branch whenever desired, though.

Keep being awesome!

~ pjf