Update the password reset flow to work with changes in Django 1.6.  Fixes #14.
Merge branch 'master' into cities