Merge pull request #47 from dimatteo/master

Fixing dev branch
bufix for subjets linking
cleanup for flat ntupler
Merge pull request #48 from dimatteo/dev-XlJets

Dev xl jets