General refactor and adding a few unit tests.
Merge branch 'master' of github.com:jordan-dinwiddy/mailsender-service