Marriage abroad V2

resinstating spain and italy logic
updating tests
Merge pull request #264 from alphagov/marriage-abroad-v2

Marriage abroad V2