Quick first pass at annotation style. #54, #56, #57, #59.
Merge branch 'master' of github.com:nprapps/civilrights