avoid confusing variable names
Merge branch 'master' of github.com:elliotpeele/prism_rest_client

Conflicts:
	prism_rest_client/resource.py