The devise mailer now receives one extra token argument on each method (...

...since Devise 3.1).  Updated confirmation view to not get the token directly from the resource itself.  It is also possible for a user not to be logged in after confirming, made changes to text to reflect this