Merge Hitlist uses Classes.

The merge_hitlists.py function now uses the hitlist and kwhit classes.
Also, debugged some of the functionality in the hitlist class. It was
not updating the scores properly on the merge.