[纪秀峰]:no evil require

受影响的文件:
    joseph_init.el
[纪秀峰]:mac support
受影响的文件:
    site-lisp/joseph/joseph_init.el
    site-lisp/joseph/joseph-mac.el
    Makefile
[纪秀峰]:Merge branch 'master' of github.com:jixiuf/emacs_conf

Conflicts:
	site-lisp/joseph/joseph_init.el

受影响的文件:
    site-lisp/joseph/joseph_init.el
    site-lisp/joseph/joseph_common.el