remove some error display
Merge branch 'master' of https://github.com/phenix3443/emacs.d

Conflicts:
	init-elpa.el
1.简单修改cedet配置