Updated MapLoom to use new merge feature format.

Also fixed incorrect history when datastore branch was not the same as the repo.