EscapeUriString changed to EscapeDataString so ampersands can be used as arguments

Used EscapeDataString to encode components of the URI rather than
EscapeUriString.  Using EscapeUriString does not escape query parameters
containing ampersands correctly.
Merge pull request #654 from ACassells/master

EscapeUriString changed to EscapeDataString