xyzzy 0.2.2.253
Merge branch 'master' into keybind

Conflicts:
	site-lisp/siteinit.l