1 3 stable

Correct default_tax.rb so it correctly deducts promotions from order total before taxing,
add promotions_total method to order.rb to facilitate this.