fixed union types
made union smarter
more union tests
Merge branch '1081_union_type_fix' into next
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Merge branch 'next' into sam_939_alt