Clean up total/subtotal display
Merge branch 'credit-notes' of https://github.com/woothemes/woocommerce into credit-notes

Conflicts:
	assets/js/admin/meta-boxes-order.min.js