factories fixed
merge
Merge pull request #17 from Mession/fix_factories

Factories fixed
Changed factories to use associations
Migrated more factories to use associations
Updated Gemfile
Yet another travis fix attempt