regex voodoo for email shizzle
Merge pull request #114 from betz/master

regex voodoo for email shizzle