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

Reverts alphagov/smartdown#93

Sorry for the git mess.
*super-tiny-nitpick* there seems to be a stray line that got added there