Add Django 1.6 to tox configuration
Fix testsuite to run on Django 1.6
Fix json import
Add Django 1.6 and Django master to travis build matrix
Fix easy-thumbnails version
Merge pull request #343 from nephila/feature/django_16

Django 1.6 support