Fix .travis.yml and tox.ini discrepancies.
Add django 1.6 to tox (and kept django-dev).
Remove unsupported python 2.6 from tox.
Remove incompatable combos, like python 3 + django 1.5.
Merge branch 'master' into stefanw-django-1.7