Merge pull request #787 from rustyswayne/1.4.0

Refactors taxation context and tax methods to allow for tax estimates