[PATCH 0 of 2 V2] keyword: inform user about keywordset in kwdemo

[Christian Ebert]

Hi,

A second attempt to inform the user about the current
[keywordset] when she runs hg kwdemo. The keywordset now also
features explicitly in the keyword configuration shown to the
user.

The second patch is a small cleanup for clarity in the code
structure.

c