Merge branch 'feature/cart'
small cleanup
updated cart to include better storing of shipping options in the session and display of shipping options in the checkout sidebar
updated to django 1.6.5
Merge branch 'master' into feature/cart