Revert "Remove trading"

This reverts commit d1b604033fdb49a60e94d3a3f84696807feb8b22.
Merge branch 'trading' into merge-trading
fixed up package.json
0.3.7
shrinkwrapped