Fix inconsistent view_name logic.  Fixes #567.
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework