OT_ME: merge called function into make_sure_enough_trans_nums()
OT_ME: merge called function into register_nym()
Merge pull request #489 from toxeus/apiMerge

OT_ME: merge called function into make_sure_enough_trans_nums()
Fix bug introduced in 76c1ee86
Merge pull request #492 from mhamrle/fix_market

Fix market
Removed RemakeSocket.
Removed OTASCIIArmor from OTSocket.
Simplified sending to do without retries and all that.
Merge pull request #490 from toxeus/socket_cleanup

Socket cleanup
Renames masterCredentialID to masterID.

This in order to make it consistent in the two places the credential is
written (and read). In one place 'masterCredentialID' was used, in an
other 'masterID'.

I've opted for 'masterID' since at yet an other place 'ID' was used
signify the credential it was an attribute for (in stead of using
'credentialID'). Renaming it like so contains the change to the least
amount of places.