Updates

Added functionality to allow shipping to be included in tax calculation.
Plugin now respects if 'Calculate tax' is set or not set.