query-params should not clobber query-string

A fix for issue #152 

This only solves just the issue that @leathekd brings up -- it allows you to use an url with a query component along with a query-params map. There are some other corner cases that could be handled by rejiggering things more, but I thought that should probably wait until another day, since the change will be bigger.