disabling tests for now.
2012 -> 2013

Finishing up the new token system 

Added option to use a CAPTCHA for confirmation resending.