Reverted 59d0a0387d907260ef8f91bbbca618831abd75a3 and fixed the tests
Ensure `_resolve_model` does not return `None`
Fix byte decode error rendering 'display_name' with OPTIONS. Closes #2084
Note on 3.0 beta
List serializer no explicitly renders as 'not supported for HTML input'
Use the new build env on Travis

faster vms, more ram, more cpu, better vm boot times

official docs coming soon
Merge pull request #2090 from joshk/patch-1

Use the new build env on Travis
Allow blank choices to render. Closes #2071.
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Use translatable error strings. Refs #2063.
Apply defaults and requiredness to unique_together fields. Closes #2092.
Further notes in 3.0 announcement
Merge branch 'master' into 3.0-beta
Minor fix for #2092.
Fix non-determanistic unique constraint mapping. Refs #2092.
small type
Merge pull request #2097 from raonyguimaraes/master

small type
Fix non-determanistic default bug. Closes #2099.
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Removed unused import from code snippet in tutorial