Switch order of checking for model_name vs module_name to stop
deprecation warning
Merge pull request #137 from jpulec/remove-django-1.8-deprecation-warning

Fix deprecation error for Django 1.8