Travis config updated
Merge remote-tracking branch 'origin/email-enhancements' into email-enhancements