Revert "switched to using templates"

This reverts commit cbe70c3ce278dedf69208286b00784d2cf32541f.
made number of rows larger
Add r.object

Closes #1857
Review 1127 by @mlucy
Merge branch '1711_test_patch' into next
merged
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Merge branch 'next' into sam_alt