Changes from home windows.
Merge branch 'master' of https://github.com/aaronc/emacs.d