change to use sendgrid
Merge branch 'master' of https://github.com/consumerreports/friendsource

Conflicts:
	config/environment.rb