emacs from work
--no-edit
--no-edit
work emacs
add gitignore
emacs
--no-edit
Merge https://github.com/wobutianl/emacs_config

Conflicts:
	ToDo/newgtd.org
	config_other/init-elpa.el
	config_other/init-git.el
	config_other/init-org.el
	config_other/init-python-mode.el
	config_other/init-smex.el
	config_other/init-yasnippet.el
	config_other/init.el
	site-lisp/eim/py.txt
	site-lisp/evil/evil-commands.el
	site-lisp/evil/evil-common.el
	site-lisp/evil/evil-core.el
	site-lisp/evil/evil-digraphs.el
	site-lisp/evil/evil-ex.el
	site-lisp/evil/evil-integration.el
	site-lisp/evil/evil-macros.el
	site-lisp/evil/evil-maps.el
	site-lisp/evil/evil-pkg.el
	site-lisp/evil/evil-repeat.el
	site-lisp/evil/evil-search.el
	site-lisp/evil/evil-states.el
	site-lisp/evil/evil-tests.el
	site-lisp/evil/evil-types.el
	site-lisp/evil/evil-vars.el
	site-lisp/evil/evil.el