Changed back to smtp; spec
Merge pull request #11 from mattdvhope/mod4

Changed back to smtp; spec