Fix model associations and FactoryGirl tests.
Merge pull request #4 from dunphyben/models

Fix model associations and FactoryGirl tests.