Updated for pull request
Merging Karl's pull request

Merge branch 'master' of github.com:dbjergaard/rivet-fast-jet-substructure