Move zeta's lightning talks
Merge branch 'reshuffle_lightning_talks'
Resolve conflicts between alpha and planeteers