Merge pull request #102 from murrekatt/develop

OTPayment decoupling and include cleanup.
Moved OTPayment and InstantiateContract into client.
Moved out cash next to core.