Test Django 1.7 on Travis
Merge pull request #42 from bfirsh/test-on-django-1.7.0

Test Django 1.7 on Travis