merged as best as possible to fit with new tabs
Merge branch 'wilbertom-chart-template' of github.com:bepetersn/chicago-justice into wilbertom-chart-template