Enable emacs-w3m
Merge branch 'eric' of github.com:ehuang3/dotfiles into eric
Merge remote-tracking branch 'origin/eric'

Conflicts:
    emacs.d/init.el
    emacs.d/org-rc.el
    zshrc