Add a merge script.
Add a merge script.

Should currently work with any Scala repo. Would be nice to generalize
for others – basically comes down to handling different version files.

slamdata/devtools,slamdata/devtools,sellout/devtools