fix for using a different address for indonesia residents
replace ternary with good, old if/else
use menaginful list names
taiwan updates and tweak to embassies yml
Merge pull request #380 from alphagov/indonesia-consulate-change

Marriage Abroad V2 updates