Added missing travis file
Make it more clear in the readme that this is the code for django
Merge branch 'master' into develop