Fixed always eager option to run based on debug
Merge branch 'master' of https://github.com/burke-software/django-sis

David - I have no idea what this is doing - I just copied settings.py from master. Guess there were commits here???

Conflicts:
	django_sis/settings.py
Merge branch 'master' of https://github.com/burke-software/django-sis
Merge branch 'master' of https://github.com/burke-software/django-sis
Merge branch 'master' of https://github.com/burke-software/django-sis
Typo!
Merge branch 'master' of https://github.com/burke-software/django-sis
Fix one Unicode issue and a EmergencyContact autocomplete problem
Merge branch 'master' of https://github.com/burke-software/django-sis
Minor fixes
Merge branch 'master' of https://github.com/burke-software/django-sis
Again...
Reapplied BSC patches to appy
Correct conditional fieldset issue
Remove obsolete reference to secondary_teachers
Added disable csrf
Get Autocomplete Light working in student admin view [13668771]
Merge branch 'master' into develop

Conflicts:
	ecwsp/sis/templates/sis/autocomplete_contact.html