small tweaks
Merge branch 'master' of github.com:georgi/eminimal

Conflicts:
	personal/setup-cycbuf.el