Revert "dont allow django 1.7 to fail"

This reverts commit 7eed06e634d7af85ba8e1dededd9ba0d4ecb87f7.

Conflicts:
	.travis.yml