Now using a combo AES/Elgamal scheme for writeins.
Merge remote-tracking branch 'origin/master'