Update Emacs config
Merge branch 'master' of github.com:gsnewmark/dotfiles