Update org

Move some org mode stuff around; also, switch to tx for pdf generation.