Handle both the id and the e-mail when resetting passwords.
Merge branch 'master' of github.com:AeroNotix/django-timetracker