Show comments on simple addresses

Also fix bug -- we were using the deprecated description attribute on
contacts.
Remove country from contacts with blank addresses

This is a cleanup after a previous migration which added country field
and set all countries to UK by default. If the contact doesn't have a
postal address we don't want Country to be set.