General cleanup, removed debugs and leftovers
Merge branch 'master' of github.com:Torxed/SlimSMTP