Bugfix: Convict merge

Missed a line when merging in convict. As a consequence they weren't getting flail xp for using their iron balls as flails
Convict Tweaks

Tweaking dNetHackisms in the convict role
	Greatly decreased spawn frequency of Malkuth Sephiroth in the quest

Added more iron bars and chokepoints to convict levels, added normal prisoners to rescue.
Colours for the walls of special areas in TTY mode

Patch by by "L" (Leon Arnott), modified by Bulwersator. Affects beehives, Mines, Wizard's tower, Astral Plane and altars.