Use email regex from django < 1.6
Merge pull request #25 from julienp/django16

Django 1.6 compatibility