Merge pull request #267 from sellout/temp-joins-ambiguous

Pretty solid equi-joins.
Merge remote-tracking branch 'upstream/master' into cross