Explicit merge in batches

The user can now insert empty lines in a merge.txt file and needs_merge
will return the files to merge from the file in batches delimited by
those empty lines.

Also, bumped version to 1.7.0