Updated Django versions to match requirements
Removed custom python2_unicode_compatible. Closes #2138 (thanks @sh4r3m4n)
Merge branch 'master' of github.com:tomchristie/django-rest-framework
Removed custom StringIO, force_text, smart_text compat
Removed custom python2_unicode_compatible. Closes #2183 (thanks @sh4r3m4n)
Merge branch 'ammend_commit'

Conflicts:
	tests/test_description.py