Settings changes for use of Mailgun; and minor formatting fixes for cleaner code review