disallowed referencing variables from inside secondary index functions (c.f. Issue #718)
added comment and changed to private inheritance for special_var_shadower_t
merge
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next