WIP wallet working again
trying to fix node-gyp failure
Merge pull request #44 from maraoz/update/package.json

first travis build passing! :D
mocha test working again
wallet @browser working again
Merge pull request #47 from matiu/feature/wallet-integration3

Feature/wallet integration3
fix conflicts