improve everything setting
Merge branch 'master' of http://git.oschina.net/lynnux/emacs

Conflicts:
	.emacs.d/config/plugin_extra.el