skill cheat: 'q' and 'esc' now work, but no hotkeys
Allow escape from skill wish menu
Merge dueling bugfixes.

Conflicts:
	wish.cpp