updating fixtures
Reverting to original mapping, updating tests
Merge pull request #246 from segmentio/fix/mailchimp

Second fix for mailchimp double opt-in