work in progress for display of shipping options
cleaned up shipping list
Merge branch 'feature/cart-4' into feature/cart