org stuff
Merge branch 'master' of github.com:markschaake/emacs-conf