update
Merge branch 'master' of github.com:absurdliyang/EmacsConf

Conflicts:
	.emacs
	.emacs.d/ac-comphist.dat
	.emacs.d/note-init.el