password reset page now shows username - fixes #268
Merge branch 'master' of github.com:scraperwiki/custard