General cleanup to remove cruft from merging code.
Merge pull request #8 from bigdatagenomics/cleanup

General cleanup to remove cruft from merging code.