Merge pull request #22 from bkargoll/master

update NtupleReader/Controller for new production