fixes for checkstyle findings
Merge branch 'email-abstraction' of https://github.com/mgeis/SimianArmy into email-abstraction