Merge branch 'restframework2-filter' of git://github.com/onepercentclub/django-rest-framework into filtering