Add support for SendGrid
Clean up the Mailgun/SendGrid configuration code a bit