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

Reverts alphagov/smartdown#93

Sorry for the git mess.
:+1: yes :dancer:, :heart: this refactoring of the question parser