Add upcase/downcase
Update ql2.desc
Add r.object
Merge takes a function + clean broken tests
Remove cacheSize, increase timeout (see rethinkdb#2170, fix tests