Merge pull request #1319 from timw4mail/email

Make valid_email helper function more accurate