Edit travis file
Merge branch 'master' of github.com:rserna2010/balanced-django-example