Fix some out-of-date options guide info
Remove some unecessary annotation options

stash.lua contains lots of automatic annotations with no options
needed, these two don't need to be an exception.
Fix tengu EV not getting updated on changes in flight status.
Give black draconians permaflight (at XL 14).

Previously they just got a temporary flight ability at XL 14, which was nearly
always useless. Black is one of the weaker colors of draconian, with an
unreliable breath and a mostly useless resistance, so giving them this
bonus seemed reasonable and should help to increase draconian differentiation.

The explanation for why they can fly continuously but other draconians who
randomly mutate big wings cannot is that black draconians also make use of
their special affinity for air magic (similarly to tengu) to assist their
flight. They are not as agile as tengu, though, so they do not get the EV
and movement speed boosts that tengu do.
Unmisspell 'transparent'
Generate artefact inscriptions on the fly (elliott)

Artefact autoinscriptions now always appear (the option to not generate
them is removed). Fixes god-gifted artefacts not being correcly
inscribed (#5974).
Add a bunch of extra runes.

The whole Elder Futhark, in fact.  There's a couple runes taken from the
Old English version as well as they are missing from the norse one, and
having no 'y' would making modern text harder to understand.

Unlike Cyrillic, there are no problems with transcription, as instead of
phonetic spelling (nearly impossible to do well programmatically), English
ortography mostly records the actual pronounciation from old times.  Well,
these times are quite a bit younger than when it was written in runes, yet
I think it's safe to say no Viking or Anglo-Saxon will come up and say this
is wrong.
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 "Replace Evaporate in the tutorial"

This reverts commit 41bd2660179393b809b004aee368f97db9320d52.
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.