Fix master from Jesse's patch
Fix up the email field on Baker
Added email template and gmail smtp settings