Add couchbase
Update rivers and heads
Misc updates
Add resultset scrolling