todos :p
Merge branch 'master' of github.com:vdemeester/emacs-config