Merge pull request #1 from unblevable/ray

Auto generate email address from maildrop
Merge branch 'master' into ray