Tidying up interpolations. A little
updates for taiwan, germany and spain
testing embassy/consulate variables
tidy up some of the code
yet moar updates but some code cleaning too
Merge pull request #383 from alphagov/more-marriage-abroad-v2-updates

More marriage abroad v2 updates