Add expand-query macro.
Switched to print from pprint
Merge pull request #237 from Gerrrr/feature/expand_query

Add expand-query macro
Correcting the use of format.

In the current code (format) function has incorrect format strings
passed, such as this "foo: %" instead of "foo: %s". This commit fixes
the issue as far as I can tell.
Merge pull request #238 from screen6/develop

Correct the use of `format`