whoops
Merge branch 'master' of github.com:mbriggs/.emacs.d

* 'master' of github.com:mbriggs/.emacs.d:
  whoops