Switch to calibrated electron/muon
Merge branch 'master' of https://github.com/iross/UWAnalysis