`conflicts` in db.query results

`conflicts` should be included in the results of db.query by default, but they shouldn't be included in the results no matter what: https://github.com/daleharvey/pouchdb/commit/22b5ac14a9b7ef64dfc91c97ff44a04504710e10#L0R29

(That is, the user should have the ability to specify conflicts = false).