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
Revert "Restore score file compat, wrt removal of Stalkers."

This reverts commit 241a7c80035675aef59c9ebace3a5d56b70e3e69.
Revert "Remove Stalkers"

This reverts commit 19fbaf86f4ea4c02d326252ac0105f5aea30887a.

Conflicts:
	crawl-ref/source/itemname.cc
Revert "Remove potions of water."

This reverts commit d34118a48d77f2a9bb4910353feb4662b87d51c0.

Conflicts:
	crawl-ref/source/potion.cc
Revert "Remove Evaporate and Fulsome Distillation, and the book of Stalking"

This reverts commit 54df5be6b9d9bdd40a116d0b4ddd192871e8adb2.

Conflicts:
	crawl-ref/source/itemname.cc
Missed a few things when resolving conflicts from restoring stalkers & mountain dwarves
Restore some lost genus enum values
Add mountain dwarves back to the manual
Revert "Purge the species desc for MDs."

This reverts commit 6540382be215bf7d7be96301d84dc72c3061cec4.
Revert "Fix improper MD species abbreviation."

This reverts commit d10eacda565e5222b971ae22ee8e54e5bc7ccbf0.
Apply aptitude changes from cb5881f43b3eec4e902b8f961c4045209aa9ef4b to mountain dwarves
Revert "Get rid of Zot:5 subvaults."

This reverts commit 7d14ff188579e1fe1445efa6415a154279dc4847.
Revert "Since staves are removed, add tridents to Xom's snakable weapons instead of duplicating quarterstaves."

This reverts commit 7757f5cbdd0aa7b00dbbb9111906778381562fea.
Revert "Remove generation of "staff" items."

This reverts commit 9dd2245c47711c143e5e5dd0ab5fe51047e55df2.

Conflicts:
	crawl-ref/source/dat/des/branches/abyss.des
Revert "Shorten Elf to three levels."

This reverts commit 53306e5898f6f2449381c84cd2debb55a8ae9dd7.

Conflicts:
	crawl-ref/source/branch-data.h
	crawl-ref/source/mon-pick.cc