make adder and mailer one script, use sendgrid
add send grid to requirements
:Merge branch 'master' into combo
update user and move to sendgrid