(#2072) - WIP - fix conflicts for all three adapters

This PR is just to kick off a build from Travis.  The real one is here: https://github.com/ig3/pouchdb/pull/4