Trying to fix conflicts
Updating to work on newer ntuples (v9x)
Updating to run over v9.6 ntuples
Merge branch 'master' of https://github.com/naodell/Analysis_CMS

Conflicts:
	plugins/WeightUtils.cc