Ignore numlock (Mod2Mask) for button events too.

Conflicts:
	config.def.h
	st.c
Fixed lock up when system time jumps backwards

Signed-off-by: Christoph Lohmann <20h@r-36.net>
Merge remote-tracking branch 'origin/master' into omaster
Simplify logic in match().
Simplify logic in kmap().