SISCOG Emacs Org seems to be OK!
Merge branch 'change-dirs' of http://github.com/bjacquet/dotemacs into change-dirs

Conflicts:
	dotemacs/siscog-org.el