Revert "Let priests of Zin follow Beogh."

This reverts commit 66e2358cbdeba77dc1f3d353dcbdd32966d3ca5f.
Revert "Remove the line for sludge Elves from the aptitudes table."

This reverts commit dfef345e98dac5401e521772f5683dc958b4431e.
Revert "Disable placing of (most) plants in the Lair."

This reverts commit 8c006ae451aa034f5c27ad707afa494634139ac9.
Revert "Fix some hidden item vaults"

This reverts commit 7c22cc395b7b3e8dfda3e38e8cc9e908021b1e5f.
Revert "Don't allow selecting Jesters via initfile"

This reverts commit d82a837c79dd88c7986a61c826dd1e4d3ddbe756.
Revert "Remove toadstools from an entry vault."

This reverts commit 7b5b3f3dd12d000d0ba27240f07751e002f9109c.
Revert "Remove Superfluous Elves."

This reverts commit 2e2439c1c302094be6e7a22505993faca2abd3b8.
Revert "Purge the beam and zap for Cigoruvi's."

This reverts commit 4d8313605d2eceb91fb272172c666631b26f5fc3.
Revert "Drop Cigotuvi's from the Vitriol card."

This reverts commit 7fc62a56f15208b9069637ec41cc35a68f86e671.
Revert "Remove a trap vault"

This reverts commit 98354d5b99be38770daebc21cf223af601153f66.
Revert "Cull somewhat less silly mystery meats as well."

This reverts commit 4cbcfd663f29e55b898ba96e46357ea975ee61a1.
Revert "Cull silliest jokes from "mystery meat" simulacra."

This reverts commit d3d6a4f35cddff74b26bfe1eaaef9ffc720633f8.
Revert "Reveal a guaranteed alarm trap"

This reverts commit cc4bd89b8211bf7720940f7836908a2d66b9e4eb.
Revert "Remove one last nausea reference."

This reverts commit 1f277de61ad2c6ffaab9749e4db83c2d6ed7e631.
Revert "Cure all nausea, permanently."

This reverts commit f2808973ab0a2f8c903d3cadc4b8c1c371e8b89a.
Revert "Don't randomly select Jester as a background"

This reverts commit 8073b7f30872fd57f2a6e6f8af69f1c01055e1cc.
Revert "Remove Jesters."

This reverts commit 8784da81ba4f351bc852e94ef03c00abd45f7165.
Revert "Drop code for Evaporate outright, it doesn't need to wait for the bump."

This reverts commit 7e2a7a3f47a561f217ef83d84974bc1801a9150c.
Revert "Remove a lot of dead code left over from the now-gone Evaporate spell."

This reverts commit dbc77522b9efab96f0a6616d1cff8330451072f1.
Revert "Give mountain dwarves the axe."

This reverts commit 0edc7688ee170c182dc86189be4ef89a3c70d329.

Conflicts:
	crawl-ref/source/aptitudes.h
	crawl-ref/source/enum.h
	crawl-ref/source/ng-restr.cc
	crawl-ref/source/ng-setup.cc
	crawl-ref/source/player.cc
	crawl-ref/source/species.cc