Add/Remove email added to Cli, email regex improved

Add/Remove email have been implemented in the Cli using a ClaimToken provided by a third command line function.  Email validation is switched to an actual regex, and email test were changed to reflect this new validation.