Revert "Reduce the number of monsters a Zot trap can recall."

This reverts commit 0ee1b69e00ea7a78de99b605650e7d9ae7cacbe6.
Revert "Don't generate the knife of Accuracy or boots of the Assassin"

This reverts commit f616a95481d8606225091dadb804e5ef3f2cbb73.
Revert "Disable Fumes"

This reverts commit 38d80603b0c59ab972c5308f48415ecbf3c2ecbc.
Revert "Make polymoths not spawn"

This reverts commit 7022c2830554313e1ddcbf578e514175cbd98df1.
Revert "Remove two totally pointless vaults."

This reverts commit 4eabf5647ede216cdcbeed928570137d9621ca23.
Revert "Remove grunt_twisty_little_passages"

This reverts commit 9a84c3dc26cf83c85bd464d4354eae244a4eb8e2.
Revert "Schedule the blinding brand for removal."

This reverts commit 5ba7f9e077c4a4e0f62b1a0e4c6b11ef4aea1fc6.
Revert "Stale pies are inedible."

This reverts commit bc49bdd7d572f1db738510e46a674c614f125493.
Revert "Remove pie description and quote."

This reverts commit c7e8f6b0797d956e60b267dccfeee4667e88f506.
Revert "Add a missing #ifdef for gas traps."

This reverts commit 10cd9e452220ebeadc7217a0637fb7eb227568a5.
Revert "Don't refer to sickness from food (ogaz)."

This reverts commit 2210f324924fa7c97c3935f3d7a0e4dddfe24580.
Reinstate fruity bat tiles
Revert "Remove Pan."

This reverts commit 3c279cd41edeaa047237d76bc47c2daa1229b78a.
Revert "Offer rotten chunks first to those who can eat them."

This reverts commit bb2be8b47de3a906c3f5c503b92f44b37029faef.
Revert "Remove some obsolete food-related options"

This reverts commit 9d29fcb8fd9b6aaf9e7ca8ebbb1c3cd0c478568c.
Revert "Identify scrolls of amnesia if read with no spells memorised"

This reverts commit 97dada43bd2e1e76f2b6a5263bbd04a3d44c2bc1.
Revert "Speed 10 for jellies (was: 9)"

This reverts commit 8dc47299d43ea3bb3a1f4f60ecd8d88ec69113a3.
Revert "Purge all of Pan from our midst"

This reverts commit 654be61b151955a3ea63375b9f7bcba796362db9.
Revert "Remove deep dwarf scions, artificers and necromancers"

This reverts commit f61ad0bcab060bc8018e8effe1bcd02ef641b45a.

Conflicts:
	crawl-ref/source/dat/des/branches/crypt.des
	crawl-ref/source/mon-gear.cc
	crawl-ref/source/tilemcache.cc
Revert "Don't generate scythes of reaping"

This reverts commit d93e8f602c464ae165c44072867787cc940153f8.