Include support for using the proxy at work.
Merge branch 'master' of github.com:pdixon/emacs.d