Fix format for prison pop rate to display 'per 100k' rather than '%'
Merge branch 'master' into gh-pages