Country questions [MERGE SECOND]

The second half of the original country question PR

please un-revert the premature merge of this branch first https://github.com/alphagov/smartdown/pull/94

The original branch is here, for context: https://github.com/alphagov/smartdown/pull/92