Applies changes that enable shoulda-matchers to work with the Zeus gem
Merge branch 'development' into 406_fix_cart_tests
Fixed most Cart tests, nine methods to go