Emacs-or-client .desktop entry
Merge branch 'master' of github.com:sjolsen/dotfiles