<fixed email verify>
Merge branch 'master' of https://github.com/gjnelson/forms