#111 - added test to surface bug highlighted in issue
#111 - added conflicts:true option so _conflicts key appear in mapreduce queries
Merge branch 'master' of github.com:daleharvey/pouchdb into 111-_conflicts-omitted
made conflicts optional when called with db.query
Merge branch 'master' of github.com:daleharvey/pouchdb into 111-_conflicts-omitted
change default of _conflicts to false
Merge pull request #352 from zichun/111-_conflicts-omitted

#111 api.query for idb omits _conflicts