Fixed conflicts

Out of all the corrections that I did, this ended up being the only minor change that needs to be committed (and it was just a duplication of the METRefToBase declaration that must have occurred when our TauAnalyzer.cc versions were merged); all my other changes were to my TauHadEta analyzer code.