Merge pull request #262 from ajgilbert/cosmetics

Another round of cosmetics
Merge remote-tracking branch 'upstream/master' into fixHiggsAsBG