Add types and term definitions
Merge branch 'master' of https://github.com/dchbx/cv