The forgotten cart changes
Merged with work copy
Merge branch 'master' of github.com:chrislynch/engine4