Add rapidityuserhooks and some cleanup
Merge pull request #3328 from mkirsano/rapidityuserhooks_3

Generators -- Add rapidityuserhooks and some cleanup