Merge pull request #42 from kdmurray91/dev

fix log messages, formats and emails