Added a few b-jet variables and synch. with Aachen
Synch'ed with runManager output path
Added option to only run merging
Merge branch 'EDMdev' of github.com:ETHZ/ASAnalysis into EDMdev