Merge pull request #161 from burke-software/temporary_develop

fixed error, other minor changes
Merge pull request #162 from burke-software/temporary_develop

fixed another error
Merge branch 'develop' of github.com:burke-software/django-sis into temporary_develop