Rubrics, flexible criteria, and annotation categories
Merge branch 's3-rubrics' of https://github.com/arkon/Markus into style-guide