Updated to Django 1.7.1
Merge pull request #178 from timgraham/1.7.1

Updated to Django 1.7.1