Consistent handling of emails, Fixes #234
Merge branch 'master' of github.com:curtisullerich/attendance