Wip
Merge branch 'master' of ssh://github.com/bluekeys/.emacs.d
Branches diverged?