grade calculation unit test
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	ecwsp/sis/scaffold_reports.py
Merge branch 'master' of github.com:burke-software/django-sis into unit_test
Appease SQLite
Merge branch 'master' of github.com:burke-software/django-sis into unit_test
new unit test
pulling in changes from remote
.gitignore change
Merge branch 'develop' of github.com:burke-software/django-sis into develop

'pulling in develop'
Django 1.7 ready! Just need to deal with 3rd party apps. See [12460515]
See if Travis will deploy to a demo instance on Heroku
Require a working version of django-simple-import
It might be helpful to specify the Heroku app name
Please build this, Travis CI
Add cache prefix if cache is being used
Merge branch 'master' of https://github.com/burke-software/django-sis
Allow nulls and blanks where no sane default value exists
Merge branch 'master' of https://github.com/burke-software/django-sis into course_sections
Merge branch 'develop' of https://github.com/burke-software/django-sis into course_sections
Merge branch 'course_sections' of https://github.com/burke-software/django-sis into course_sections