avoid "killed by triggering an arrow trap trap"
avoid "Created a arrow trap"
Remove out of date info from init.txt and options guide.

The files referenced a removed option (autopickup_no_burden) and
carrying corpses/skeletons.
Fix a Screaming Sword line (nrook)

(cherry picked from commit 5540f67660800a8985ae33c6b3ace2bc8b6a16d9)
Fix launcher/ammo brand interactions involving penetration (potatolizard).

Previously crossbow of penetration + bolts of flame gave both brands, but
crossbow of flaming + bolts of penetration only gave penetration. Now
both combinations give both brands. This is different from the 0.14 behavior
(both combinations just gave the ammo brand), but it makes a little more
sense (comments in the code just say no stacking _elemental_ brands, and we
already allow both brands to apply with launchers of speed or velocity).
Make dispelling cancel Agility on monsters (sharkman1231)
Don't place runed doors in zigsprint

Directly calling the lua 'subst' function doesn't accept multiple
comma-separated operations at once. The .des parser splits the comma syntax into
separate lua function calls when using SUBST normally.
Also, subst wasn't the desired operation for adding water beneath the items and
monsters anyways.