Merge changes to zendesk/credit_card_sanitizer back into ggrossman/credit_card_sanitizer