Nick's edits...
Merge branch 'master' of github.com:craftsmancoding/moxycart