fix trade model logic. fixes #36 and fixes #27
Merge branch 'master' of github.com:alexstoddard/reBook