recovering from Emacs bankruptcy.
Merge branch 'master' of github.com:SamJuvonen/dot-emacs