clean-up and matching improvements
Merge branch 'EDMdev' of github.com:ETHZ/ASAnalysis into EDMdev