Fastjet contrib interface changes

take changes from jet met PR (but only those needed for compilation/running)
why are these enums here?
This looks like a copy-paste of http://fastjet.hepforge.org/svn/contrib/contribs/Nsubjettiness/tags/2.1.0/Njettiness.hh
They are also not used