Fixed bug in merge()

Previously merge() never produced correct results for
 right or outer joins. This new implementation is a start
 to produce reliable results, but is probably only a 5%
 improvement
Updated to rand(1:N) instead of randi(N) style
Temporarily shut down tests broken by recent promote_type() changes.