Add a builder api

[garethbowen]

It would be useful in some situations to construct a query object using the builder pattern. This could be stored internally using the same object structure as required by the convert api.