ot script fix
Merge pull request #118 from lclc/fix

ot script fix
Cleanup and structure improvements of OTAccount.