Revert "Revert "Country questions"" [MERGE FIRST]

Reverts alphagov/smartdown#93

Sorry for the git mess.
I agree, will do.