updates to japan, china and france
clean up code a little
Merge pull request #407 from alphagov/marriage-abroad-v2

Updates to japan, china and france - this is a V2