Refactor email module to eliminate code duplication
Merge branch 'master' of https://github.com/mpwoz/carpool