new annotations style
Merge branch 'master' of github.com:nprapps/civilrights