Build fixes after opentxs restructurings.
Merge pull request #13 from murrekatt/develop

Build fixes after opentxs restructurings.