Merge branch 'master' of github.com:jixiuf/emacs_conf