adding in the vcards (starting to) using the xsd stuff.
Merge remote-tracking branch 'origin/andyrdap' into andyrdap