Fix bad rebase from previous code review

Summary: I messed up my rebase. If the weekly job ever gets to run it will fail because of the fixes not contained in this revision. Help me prevent the catastrophe.

Test Plan: student_teacher_count.q executes without failure

Reviewers: jace, mattfaus

Reviewed By: jace

Differential Revision: http://phabricator.khanacademy.org/D3821