96% fix for issue #808

Unfortunately worn items with charges (not implemented) are not ejected
from inventory. And item letter collisions are not corrected.
Merge remote-tracking branch 'dda/pr/1167' into dda-master