Revert "Don't generate scythes of reaping"

This reverts commit d93e8f602c464ae165c44072867787cc940153f8.
Revert "Do not generate hammers unless defined in a vault"

This reverts commit 92a6f35f339cb52a0fd7ec4ad2014142fb80e110.
Revert "Remove a 402 years old fart joke."

This reverts commit 772cbec2479d6b59ccb91cad149c7edf8968cf6f.
Revert "Replace Elf:3- with Elf:$"

This reverts commit aa0373c70c85b577dfafc581e8fa74aec05097ec.
Revert "Remove gas traps."

This reverts commit 6143d70c89864a3849010fd330e4ee22e4618c5d.
Revert "Remove a Dwarf reference from Zigsprint."

This reverts commit 3d5b449c0f042e5255238e57e316f7de34eab284.
Restore Dwarven Hall and misc monster descriptions

These descriptions are for things that were removed upstream but not in
dcss-ehe.

This partially reverts commit 2cb6485c0136d4b8185bc3271180cf24c55ebd48.
Revert "Remove a claim that Heroism improves your skill with traps."

This reverts commit b55b161e8cbe7ca2a7468dcb210282ada9ae6dd8.
Revert "Don't let --mapstat try to build Dwarf maps."

This reverts commit 19e1bf6eebfe1604a0dbeaab3975128e19543ee6.
Revert "Add a compat lua callback for removed cloud traps."

This reverts commit f2498f4b3bcf8f0cb01b18d8b19546492a0afc04.
Revert "Remove traps from entry vaults"

This reverts commit 3b61b3c9b3ba94a78a231cd7db30d633c119fd6a.
Partially revert "Remove a crapload of references to removed things."

This partially reverts commit 45dcbe7e4728c8276da687ebd43c7d43c97463f5.
Revert "Let cloud traps follow their mechanical brethren."

This reverts commit aca0573f562eff4f88894207241bf7bea81595e6.
Revert "Don't place boring traps randomly."

This reverts commit 0deee0c0e46af05e09c6bc63ac43714ac9b002d0.

Conflicts:
	crawl-ref/source/dungeon.cc
Revert "Remove the Traps skill."

This reverts commit 51611e44436c86d1a9b8d1a14cc771c1920b92d2.
Revert "Don't give wanderers the Traps skill."

This reverts commit 2eac45d2c7194d3fcf6287496b0b8bb3c040dab3.
Revert "Let everyone spot traps, at XL/3 skill."

This reverts commit db1b99369f49b03200be56e404c688e36acdbb9d.
Revert "Purge Pan's desc."

This reverts commit f42256aab92342bfdbe2584bef806e5d985e520c.
Revert "Remove Pan."

This reverts commit 7d6dd4ae4fdadf6652c69fccb336768100ba9731.
Revert "Remove Lamia's band"

This reverts commit 1f063cc540ff19be10bdfa2a29dd86dacfd7cca6.