Add a bit more robustness when starting/killing hierarchy watcher thread
Get rid the forgotten dependency on org-mode