Switch to org-plus-contrib, and start on some new init.el macros.