update .emacs.d
Merge branch 'master' of https://github.com/benfried/dotfiles