Update to SusyNtuple git master June 12.
Move to use MCWeighter
Do a little code cleanup