fix tests for django 1.7
fix compat
Merge branch 'django1.7'
update .travis.yml with django 1.7 test cases