merge
Merge branch 'master' of github.com:labinxu/emacs-conf