(#218) - fix _conflicts not in returned results
(#218) - fix http _conflicts and finally()
(#225) - 2.2.7
(#228) - actually run phantomjs tests
(#233) - greppable node tests
(#190) - implement attachments=true for query()
(#232) - 2.3.0
(#235) - add travis badge
Merge https://github.com/pouchdb/mapreduce
Updating to master on upstream.