added jQuery's extend method into Pouch.utils
#111 - added test to surface bug highlighted in issue
#111 - added conflicts:true option so _conflicts key appear in mapreduce queries
replaced JSON.parse(JSON.stringify( with jQuery's extend method
Merge branch 'master' into 337-extend-method
#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
#308 Add filter into replication identifier with 2 tests for it
Merge https://github.com/daleharvey/pouchdb
made conflicts optional when called with db.query
using actual jQuery extend instead of node-extend
Merge pull request #354 from ymichael/337-extend-method

#337 added jQuery extend method to Pouch.utils
Merge branch 'master' of github.com:daleharvey/pouchdb into 111-_conflicts-omitted
change default of _conflicts to false
Merge branch 'master' of github.com:daleharvey/pouchdb
Ignore timeout from running tests on slow computer
Merge pull request #356 from adampolak/232-changes-api-confusion

232 changes api confusion
Merge pull request #357 from chunmun/master

#308  Add filter into replication identifier with 2 tests
get around issue 346 by giving a content-length header to non-post and non-post requests