Various fiddling
Merge branch 'master' of github.com:wdenton/.emacs.d