Merge pull request #16 from ironcladlou/cart-refactor

Unit test reorganization
Minor cleanup
Merge pull request #17 from pmorie/dev/cartridge_refactor

Minor cleanup
Move private endpoint logic to v2 model

Separate v2 model code into the actual v2 model class. Introduce a v2
model test to exercise that code.