ten years of crufty emacs hax that I never took the time to clean up
Merge branch 'master' of https://github.com/davidbstein/dotfiles