account activation functionality and tests all green
finish password resets and testing
sendgrid configuration for heroku
fix merge conflicts