Proper tests for add and widthdraw funds.
Merge branch 'master' into HEAD
Merge commit '47650c56289e696f0cf76a42cfa8a79b9192aeb8'
Fix for showing api secret key, using 'marketplace_uri' from the user object now.
Merge pull request #362 from nodesocket/retirement

Fix for showing api secret key, using 'marketplace_uri'.