Improvements to the key as well as a couple of other tweaks
[12289491]
Merge branch 'develop' of https://github.com/burke-software/django-sis into develop