* Added strip_fields & corresponding test to Row, which strips all of the fields.
* Strips ":::" for Google contacts that have just "Blah :::", with nothing after the ":::".
* Resolved merge conflicts
* When deduping, joins the unique type-strings for Websites / Phones / Addresses
* Strips whitespace from a unique field before merging.
* Standardized phone extension formatting.