Updates for org-mode 8, fix issue with Table of Contents