fixed the django-rest-framework view set and serializer so that tp #677 doesn't introduce bugs
Merge pull request #162 from kobotoolbox/tp677-quickfix

fixed the django-rest-framework view set and serializer
Merge branch 'master' into skip-logic-tests