Bug with OrderAndItemCharges

See https://groups.google.com/forum/?fromgroups=#!topic/django-oscar/12wgPwEuVnY

Looks like there may be an issue with the `OrderAndItemCharges` class not playing nicely with the new shipping discounts functionality.