more fixes, some type changes in protobuf
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor