Will/ai grading pr feedback

Respond to PR feedback on #358   @stephensanchez 

If we *really* want to, we could squash DB migrations before merging this to master, but I'm not sure if it's worth the effort.