merge
update
Merge branch 'master' of https://github.com/bloodynumen/emacs.d