Change SENDGRID_USER to SENDGRID_USERNAME for consistency with existing code
Merge branch 'feature/sendgrid_events' into develop-fftf