Add Craig Robinson and reshuffle

This reshuffles the schedule a bit to squeeze Craig Robinson in.

(And sneaks in a few other role fixes.)