Replacing 'for now' with more conventional TODO
Merge branches 'irdan/TestPGP' and 'irdan/PersonaPGP' into irdan/PersonaPGP