Put back future stuff

This reverts commit a36e5345bfb0e8527d774a3d5debf7945a13c2e8.
Merge branch 'master' into stage
Merge branch 'master' into stage

Pulling print styles
add print style
resize sample image
add example
intermediate vs final result sets
types of operations
add nested-expr
regenerate latest content for dev guide, manuals, and new c 2.1
set up cbl concepts
expressions
comparing null and missing
add comparisons
arithmetics
add functions
Gwen's copyedits to intro
gwen's edits to query integrated
Merge branch 'stage' of https://github.com/couchbaselabs/docs-ng into stage
edits