Josh Geenen's gContactSync + my trivial UI patches