fix various trade logic special cases
Merge branch 'master' of github.com:alexstoddard/reBook