En dash rather than hyphen

Also standardise on double hyphen.
Merge pull request #324 from alphagov/dashes

En dash rather than hyphen