email working
update forgot password link
Merge branch 'master' of github.com:davidemerritt/voteordie