first whack at a failing test for schema lost during merge
updte tests
Merge branch 'master' of github.com:slamdata/slamengine into merging
work in progress
Merge branch 'merging' of github.com:mossprescott/slamengine-1 into merging
patch up in case schema is Init
fix broken tests
Merge pull request #96 from jdegoes/merging

Revamp merging algorithm to preserve structure on both sides. Fixes #96, closes #96.