Fix for bug https://github.com/openhatch/oh-mainline/issues/1401
Fix for bug https://github.com/openhatch/oh-mainline/issues/1401
Merge pull request #1 from onceuponatimeforever/Add_email_settings

Fix for bug https://github.com/openhatch/oh-mainline/issues/1401 (@onceuponatimeforever added email testing settings)
Merge pull request #1409 from Winterflower/master

Fix for bug https://github.com/openhatch/oh-mainline/issues/1401