Merge pull request #43 from phy6phs/master

Recent changes since reforking to clean up git mess
Major bug fixed: using 2012 pileup file now
Merge pull request #44 from senkin/master

PU2011 -> PU2012
turn back on met analyser as histos weren't being filled