Moved out function to get rid of OTPayment in OTPseudonym.
Include cleanups.
Merge pull request #102 from murrekatt/develop

OTPayment decoupling and include cleanup.