Email working

Based changes on wedding_website adjustments to get email working