Use *yon-chan* as buffer name.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	yon-chan.el