Merge pull request #361 from nwoods/miniAOD_dev

Fix impact parameter ntuple branches