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.
Merge pull request #491 from Open-Transactions/renames_masterCredentialID_to_masterID

Renames masterCredentialID to masterID.
Simplified receiving to do without retries and all that.
Modified to have a connect in preparation to move logic from socket into connection.