Revert "Revert "phabricator better email relay settings""

Puppet lint && PEP8

This reverts commit 0844c50b04f23b8d655f3e21a76efc31f6edbe62.

Change-Id: Ic9184fec58e560bd9fd51cc1b622cc0ed67184eb