RSA Keyfiles added, String decorator implemented
merge branch 'stage3' of https://github.com/thornwishstalon/flaming-octo-nemesis into stage3
bug fixes