Re-add org-plus-contrib
Remove multi-term, since it it not used