fix for django 1.7 exception not existing
fixing tests for django 1.7
Fixed conflict
Merge branch 'Andrew-Crosio-django1.7_compatibility'