Refactoring

There was still some duplicate AES encryption code in the Protect-KeyDataWithPassword and Unprotect-KeyDataWithPassword functions.  These have been updated to use the newer Protect-DataWithAes and Unprotect-DataWithAes functions that were extracted during the ECDH updates.