Code cleanup. Added template conditional for suppressing email fields in a vcard...