Merge pull request #1 from alexeyfinkel/master

Pull Request adding Nicole's extra variables.
Tweak Alexey's commits

Address the following:
    * Style issues with variable naming, brace placement
    * Names of histograms
    * Add in filling of deltaR for Truth
Loosen condition on filling "Other Phi*"

We now fill other_phistar and other_y if the object we are getting them
from is good, even if the object we are placing them in is not. This
allows us to see what the real value should be even if the reco Z fails.
Add other_y and other_phistar to RooWorkspaces
Add python cfi for electron momentum regression
Add electron calibration root file

This file is required for the electron calibrations to run,
unfortunately, and therefore it is easiest to have it in the git
repository instead of requiring the user to go hunt it down themselves.
Add electron regression correction to data cfgs
Update ZDefinitions to remove Double Electron
Included trackless phi-correction in a more generally relevant way.