made some small design changes
Merge branch 'master' of https://github.com/lita/email_service