fixup! fixup! Fix all uses of UsageKeys and CourseKeys, and all of their...

... tests.

@cpennington 

@nasthagiri already reviewed over my shoulder.