2to3, replace __unicode__ with __str__
simplify test organization
force_text to fix some python 2 errors
fix noinput/interactive arg
update DRF version for tests
use six.string_types for python2 compat
Merge branch 'master' into py3k

Conflicts:
	.travis.yml
	contrib/files/util.py
	contrib/search/serializers.py
	patterns/relate/serializers.py
try giving more time to redis
try explicitly importing celery_app instead
update trove classifiers