up to date
Merge branch 'master' of https://github.com/LiaoPengyu/emacs.d