backport from p2: -Dp: chars<32 as hex, print short one-line context on ok
Merge branch 'master' of github.com:perl11/potion

Fixed conflicts:
	tools/compile.c