Minor cosmetic changes to cohorts and omr forms
Cleaned up omr import
benchmark_grade urls 1.6 compat
Merge branch 'master' of https://github.com/burke-software/django-sis

Conflicts:
	ecwsp/omr/models.py