Wrap order total values in <span>s, float labels left and values right on the cartpage, to avoid lines breaking with longer titles.
Added another block to checkout.html, encapsulating the back/next buttons.
Merge branch 'master' of ssh://github.com/stephenmcd/cartridge
Fix text alignment.
Merge
Update travis env for Django 1.5
Merge branch 'master' into feature/better-cart-order-totals-styling
Apply the label alignment to all appearances of order totals.
Merge branch 'master' into develop
Merge branch 'feature/better-cart-order-totals-styling' into develop

Conflicts:
	cartridge/shop/static/css/cartridge.css