Use 'and' in query only for >1 clauses.
Merge pull request #3 from philipmw/and-wrapper

Use 'and' in query only for >1 clauses.