Merge branch 'develop' of https://github.com/burke-software/django-sis
Updated django-ldap-groups for django 1.6+
Need to deal with mp weights correctly [9991826]
fix on prev commit
David Burke hates his life
Just fucking run already grade calc - working around odd exceptions so grades work
Fixed import error saving comments [9991826]
Fix admissions dashboard
Fix alumni dashboard
Hack to make grade calcs always round to 0.01
Hot fix to show admissions/alumni
Added settings_server [10041300]
Don't send emails to @change.me [10055928]
Merge branch 'master' of https://github.com/burke-software/django-sis into grade_report_redo

Conflicts:
	ecwsp/schedule/models.py
Made some filters can_remove = False