fixed issue #6 and wrote passing test

Added merge! for client.convert_query_to_url to overwrite params.  Wrote passing test for method.