Added Note on tox & .pyc files. Fixes #1957
Revert "Added Note on tox & .pyc files. Fixes #1957"

This reverts commit d6ccdfc53d266e1f6b329069722c106775120181.
Ability to override default method names by customizing it
Tests for validating custom_method_name router attribute
Merge remote-tracking branch 'rahul/master'
Added missing default style for FileField
More helpful error message when default `.create` fails. Closes #2013.
Merge branch 'master' of github.com:tomchristie/django-rest-framework
Merge pull request #1 from tomchristie/master

Merge upstream
Set user on wrapped request
Merge branch 'master' of github.com:tomchristie/django-rest-framework
Use httpie for tutorials
Merge pull request #2 from tomchristie/master

Merge upstream
Not allow to pass an empty actions to viewset.as_view(). Refs issue #2171
Only show pip install for httpie
Merge branch 'fixes/2013' of git://github.com/gregmuellegger/django-rest-framework into gregmuellegger-fixes/2013
Minor tweaks for helpful message on Model.objects.create() failure.
Merge branch 'gregmuellegger-fixes/2013'
Update README with 3.0 info.
FileUploadParser. Raising StopFutureHandlers removes any handlers not yet run for the active set. Closes #2109.