COUNT mappings properly

.with_mapping_count no longer counts 1 mapping for sites with 0
Pluralize mappings
Merge pull request #150 from alphagov/fix-mapping-counts

COUNT mappings properly