Added Travis CI.
Fixed support for Django master branch.
Merge branch 'master' into admin