fix for issue #9 make sure resource_uri takes pk_field overrides
added tests for issue #9
Merge remote-tracking branch 'upstream/master' into pk_field_override_fix
resolves #11 and resolves #9