Move syllabus into mako
Move some specifics from syllabus back into master.