Updated models and migratiosn to include categories and pairs
Merge pull request #3 from bobolinks-2014/setup

Updated models and migratiosn to include categories and pairs