Add tips for getting email working
Better explain when to change gitlab_email_from
Merge branch 'email_settings' into 'master'

Add tips for getting email working

Fixes #212

See merge request !176