update tox.ini and travis.yml to use django 1.5.1
Merge branch 'master' into django1.6