Added some methods for merging two files.
Fixed some bugs in the merge utilities
Thinking about handling filesets instead of just files.