Back to using the previous emacs call (the machine was actually running an old version)
Merge branch 'master' of https://github.com/Ferk/xdg_config
Merge branch 'master' of https://github.com/Ferk/xdg_config