Update config, move more options into user.el, set up org-capture and partition user.el by application/mode