Modified the shipping view to provide extra shipping method information
Merge branch 'watg' of github.com:watg/spree into watg