Change confirmation email so token is set correctly due to devise update
Merge branch 'confirmationfix' of https://github.com/alexhartley/drydiary.com into alexhartley-confirmationfix