Working on stuff.
Merge branch 'master' of github.com:craftsmancoding/moxycart