Issue #16: merge-parser: Hash addresses by file/line

Two binaries typically won't have the same address for a particular
file/line combination, so rehash them by file/line instead of using
the raw address.

This won't work very well for lines with multiple possible addresses
though.