Adding email options
Merge branch 'master' of https://github.com/jchiavaro/surface