Don't include country if contact is UK address

This is a bit naughty as I'm letting rogue newlines get rendered.
Maybe I'll have the brain power to get rid of them in the morning.