Simplified the whitelist pattern matching, and using the same format as our Sendgrid unsubscribe message.
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev