get mail config from ENV
More values from env
PROC testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/config.yml