Upgraded to Django 1.7
Fixed some broken tests
Fixed more test problems
Fixed remaining broken tests
Fixed a spacing issue