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

regex voodoo for email shizzle