Fixed misc syntax errors
Merge pull request #386 from jchamberlain/1.2/develop

Fixed misc syntax errors in cart controller