Merge branch 'master' of https://github.com/bachase/.emacs.d
Merge branch 'master' of https://github.com/bachase/.emacs.d