Sorry unuseful commit message. Various changes.
Merge branch 'master' of ssh://git@github.com/couchbaselabs/CBLiveDemo.git