Add a resource_uri_fieldname property to the resources in order to use a particular field as pk, and not just 'pk' this helps to create easily the nested resources and mantain backward compatibility using as default 'pk', tests included :)
Remove 'pk' in update was replaced with the uri fieldname.
Use tox.ini of master
Change name to uri_fieldname (is obvious we are talking about a resource then is not needed in the name), and add it to the docs of resources and in the example
Merge https://github.com/jorgeecardona/django-tastypie

Conflicts:
	docs/resources.rst
	tastypie/resources.py
	tests/basic/tests/http.py
	tests/basic/tests/views.py
	tox.ini