Update config
Merge branch 'master' of https://github.com/satoshi-takano/emacs-config

Conflicts:
	ac-comphist.dat