Added tests for replication with conflicts, and included CouchDB's revision tree test suite.  Minor refactor the all_docs test.
Expand the implementation of winningRev and Pouch.merge to handle non-linear revision trees.
Merge branch 'fixed-revtree' of git://github.com/jlaxson/pouchdb into jlaxson-fixed-revtree
Fix winningRev sort to return ints instead of booleans
Merge pull request #327 from daleharvey/jlaxson-fixed-revtree

Jlaxson fixed revtree