Start to make benchmark_grade play nicely with other grade input methods
Merge branch 'master' of https://github.com/burke-software/django-sis