Merge branch 'master' of https://github.com/iensen/emacs-config
Merge branch 'master' of https://github.com/iensen/emacs-config