add config.
Merge branch 'master' of github.com:ashizawa/emacs.d

Conflicts:
	config/40_yaml-mode.el
change helm complete setting.