Made ql-refactor branch compile on gcc 4.7 with trivial fixes.
Added an unreachable() line in type_manip.hpp to make things compile.
Merge branch 'ql-refactor' of github.com:rethinkdb/rethinkdb into ql-refactor
Removed spurious 'json' require line from lib/net.rb.