Add a number of new types
Add substitution groups for events
Merge branch 'master' of https://github.com/dchbx/cv