Merged with couchbaselabs/docs-ng stage

Amy -

Let me know if this works.

Thanks,

Jeff