fixes JS test driver bug
Mo' failing tests
Commenting out orderby
fixed filter (I think?)
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor
yet another one of those pesky JS eval problems
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor
Uncommenting, let's not hide bugs
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor
Fixing error messages
A few changes: tests, js driver and js tests
fixes JS driver func wrap bug
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor

Conflicts:
	test/rql_test/src/control.yaml
fixes same problem for python
Tests for nesting r.row(s)
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor
fix some ruby tests
Fixing up some shizzle
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor