zepto added
updated build
and removed jquery
merging
tests need jquery
wait thats not the issue
need to point to zepto now
added events module
added polyfill
Update src/adapters/pouch.websql.js
Update src/adapters/pouch.idb.js
corrected missing '}'
#111 - added test to surface bug highlighted in issue
#111 - added conflicts:true option so _conflicts key appear in mapreduce queries
#232 - Callbacks to db.changes call can be passed only through options object
Removed unused error callback from db.changes calls in tests
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