get certificate generation working with the new annotation types
Merge branch 'complete_certificates'