update emacs
Merge branch 'master' of github.com:gridaphobe/dotfiles